From a0c9152e2c92ea31361223852c1328c3155304e6 Mon Sep 17 00:00:00 2001
From: liyuqian <201963020@qq.com>
Date: 星期三, 10 八月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java |    2 +-
 1 files changed, 1 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 b3c9610..2bca4c3 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,7 @@
      * @return Result
      */
     @PostMapping(value = "/activity/list")
-    Result getActivityList(@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);
 
 
 

--
Gitblit v1.8.0