From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
index 2d64453..990677b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
@@ -17,7 +17,7 @@
import java.util.Map;
/**
- * 惠民卡支付记录
+ * 玩湃惠民卡支付记录
* @author mitao
* @date 2025/3/31
*/
@@ -47,13 +47,13 @@
return payHuiminService.getStaticsData(query);
}
/**
- * 退款惠民卡
+ * 退款玩湃惠民卡
* @param id
*/
@PostMapping("/base/tPayHuimin/refund")
- public ResultUtil<?> refund(@RequestBody Integer id){
+ public void refund(@RequestBody Integer id){
try {
- return payHuiminService.refund(id);
+ payHuiminService.refund(id);
} catch (AlipayApiException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1