From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 b3c9610..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
@@ -32,7 +32,7 @@
* @return Result
*/
@PostMapping(value = "/activity/shopId/list")
- Result getActivityList(@RequestParam("shoId") String shoId);
+ 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