From bcf40504dd6dbad43d4d54a5c099abceb8de6d71 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 17:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java b/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java
index 01480f7..53c3996 100644
--- a/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.CloseDTO;
import com.doumee.dao.business.dto.SaveUnionChangeDTO;
import com.doumee.dao.business.dto.SmsCheckDTO;
import com.doumee.dao.business.dto.UnionChangeBXDDTO;
@@ -101,10 +102,10 @@
@ApiOperation("鍏抽棴鍚堝苟鍗�")
- @GetMapping("/close")
+ @PostMapping("/close")
@RequiresPermissions("business:unionchange:close")
- public ApiResponse close(@RequestParam Integer id) {
- unionChangeService.cancelMerge(id);
+ public ApiResponse close(@RequestBody CloseDTO closeDTO) {
+ unionChangeService.cancelMerge(closeDTO);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3