From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期一, 05 八月 2024 18:45:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java index b2a1681..c53c4c5 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java @@ -159,9 +159,13 @@ /*** * 鏌ヨ鐢ㄦ埛浼樻儬鍒� 鏄惁鏈変粖骞村彂鏀炬寚瀹氱殑鐢熸棩鍒� */ - @PostMapping(value = "/user/birthday/coupon/list") + @PostMapping(value = "/coupon/birthday/list/user") Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto); - + /** + * 鑾峰彇浼樻儬鍒搁鍙栬鍒欏垪琛� + */ + @PostMapping(value = "/coupon/receive/rule/list") + Result getReceiveRuleList(); } -- Gitblit v1.8.0