From 5c565f444b2575024f947eca6f45d478405860d0 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 20 十二月 2022 16:53:29 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 a564a79..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
@@ -43,7 +43,8 @@
      * @return Result
      */
     @PostMapping(value = "/activity/check")
-    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
+    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,
+                 @RequestParam("ordersTotal") BigDecimal ordersTotal,@RequestParam("shopId") String shopId);
 
 
 

--
Gitblit v1.8.0