From 6af64892d593303fed386e468347c2ff41ab99b6 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期五, 12 八月 2022 19:52:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 2 +- phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java index 029ead5..015c101 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java @@ -20,6 +20,7 @@ private String operatorName; /**娲诲姩鏍囪瘑*/ private String groupBuyId; + private String id; /**鍙戦�佽褰�*/ private CouponRecordDto couponReleaseRecordItem; /**鐢ㄦ埛璇︽儏*/ 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 2bca4c3..34779c6 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); /** -- Gitblit v1.8.0