From 1a03c63abab3409bfe3831bf67025cb3140fc9ef Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 18:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/company/src/main/java/com/doumee/api/business/UnionChangeController.java |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java b/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java
index 7098f83..1f5e10a 100644
--- a/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java
+++ b/server/company/src/main/java/com/doumee/api/business/UnionChangeController.java
@@ -90,40 +90,4 @@
         return ApiResponse.success(unionChangeService.findById(id));
     }
 
-    @PreventRepeat
-    @ApiOperation("鍒涘缓鍚堝苟鍗�")
-    @PostMapping("/merge")
-    @RequiresPermissions("business:unionchange:create")
-    public ApiResponse merge(@RequestBody SaveUnionChangeDTO saveUnionChangeDTO) {
-        return ApiResponse.success(unionChangeService.merge(saveUnionChangeDTO));
-    }
-
-
-    @ApiOperation("鍏抽棴鍚堝苟鍗�")
-    @GetMapping("/close")
-    @RequiresPermissions("business:unionchange:close")
-    public ApiResponse close(@RequestParam Integer id) {
-        unionChangeService.cancelMerge(id);
-        return ApiResponse.success(null);
-    }
-
-
-    @ApiOperation("绛剧讲鐢宠鍗�")
-    @GetMapping("/getSignLink")
-    @RequiresPermissions("business:unionchange:query")
-    public ApiResponse getSignLink(@RequestParam Integer id) {
-        unionChangeService.getSignLink(id);
-        return ApiResponse.success(null);
-    }
-
-
-
-    @ApiOperation("涓婁紶淇濋櫓鍗�")
-    @PostMapping("/uploadBXD")
-    @RequiresPermissions("business:unionchange:query")
-    public ApiResponse uploadBXD(@RequestBody UnionChangeBXDDTO unionChangeBXDDTO) {
-        unionChangeService.uploadBXD(unionChangeBXDDTO);
-        return ApiResponse.success(null);
-    }
-
 }

--
Gitblit v1.9.3