From 2fc4d1e0a7d1e786c99f3d113ac4449be2659c3f Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 11 四月 2025 09:09:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java
index 2a96015..c121f7a 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.activity.model.HuiminPayQuery;
import com.dsh.guns.modular.system.model.SalesDetailVO;
-import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -39,8 +37,8 @@
* 退款惠民卡
* @param id
*/
- @GetMapping("/base/tPayHuimin/refund/{id}")
- ResultUtil<?> refund(Integer id);
+ @PostMapping("/base/tPayHuimin/refund")
+ void refund(Integer id);
@PostMapping("/base/tPayHuimin/export-data")
List<SalesDetailVO> exportData(@RequestBody HuiminPayQuery query);
--
Gitblit v1.7.1