From cd7240f7651c7d12a718ba4e9496b673bd8efc21 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 06 四月 2023 14:57:44 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 34779c6..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
@@ -42,8 +42,9 @@
      * @param ordersTotal 璁㈠崟鎬婚噾棰�
      * @return Result
      */
-    @PostMapping(value = "/activity/list")
-    Result check(@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