Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

nidapeng

2024-03-28 dc3cfa57c400ded43fdac3a73c7be27a18a90b23

 server/service/src/main/java/com/doumee/service/business/UnionApplyService.java

@@ -102,7 +102,7 @@
     * 保单合并
     * @param saveUnionApplyDTO
     */
    void merge(SaveUnionApplyDTO saveUnionApplyDTO);
    Integer merge(SaveUnionApplyDTO saveUnionApplyDTO);

    /**
     * 取消合并单