From bba4dceccfb4d1c38b41ca3e7f9e6bc98f34d85f Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 23 十一月 2022 19:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' 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