From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/HuiminCardClient.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/HuiminCardClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/HuiminCardClient.java
index 6445fae..bb9933e 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/HuiminCardClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/HuiminCardClient.java
@@ -21,9 +21,8 @@
@PostMapping(value = "/tHuiminCard/save")
void save(@RequestBody THuiminCard tHuiminCard);
- @GetMapping(value = "/tHuiminCard/queryPage")
- Page<THuiminCard> queryPage(@RequestParam("page") Page<THuiminCard>page,
- @RequestParam("tHuiminCard") THuiminCard tHuiminCard);
+ @PostMapping(value = "/tHuiminCard/queryPage")
+ Page<THuiminCard> queryPage(@RequestBody THuiminCard tHuiminCard);
@GetMapping(value = "/tHuiminCard/getById")
THuiminCard getById(@RequestParam("id") Integer id);
@@ -39,4 +38,9 @@
@GetMapping("/tHuiminCard/changeState")
String changeState(@RequestParam("id")Integer id, @RequestParam("status") Integer status);
+ @GetMapping("/tHuiminCard/getCards")
+
+ List<THuiminCard> getCards(@RequestParam("storeId")String storeId);
+ @GetMapping("/tHuiminCard/addPayHuiMing")
+ void addPayHuiMing(@RequestParam("studentId")Integer studentId, @RequestParam("cardId")Integer cardId);
}
--
Gitblit v1.7.1