From 7e80bb0a3bb2247fb519e00722b76145456981df Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 04 五月 2023 19:01:03 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
index 51ddff9..6ed6c1d 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
@@ -31,8 +31,8 @@
* @param shoId 闂ㄥ簵鏍囪瘑
* @return Result
*/
- @PostMapping(value = "/activity/list")
- Result getActivityList(@RequestParam("shoId") String shoId);
+ @PostMapping(value = "/activity/shopId/list")
+ Result getActivityList(@RequestParam("shoId") String shoId,@RequestParam("appId") String appId);
/**
@@ -42,8 +42,9 @@
* @param ordersTotal 璁㈠崟鎬婚噾棰�
* @return Result
*/
- @PostMapping(value = "/activity/list")
- Result getActivityList(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
+ @PostMapping(value = "/activity/check")
+ Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,
+ @RequestParam("ordersTotal") BigDecimal ordersTotal,@RequestParam("shopId") String shopId);
--
Gitblit v1.8.0