From c800715e798d45e50aa6b8e6930a7a680526177d Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期三, 10 八月 2022 14:27:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 4 ++-- 1 files changed, 2 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 51ddff9..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 @@ -31,7 +31,7 @@ * @param shoId 闂ㄥ簵鏍囪瘑 * @return Result */ - @PostMapping(value = "/activity/list") + @PostMapping(value = "/activity/shopId/list") Result getActivityList(@RequestParam("shoId") String shoId); @@ -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