Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java

@@ -162,6 +162,10 @@
    @PostMapping(value = "/coupon/birthday/list/user")
    Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);


    /**
     * 获取优惠券领取规则列表
     */
    @PostMapping(value = "/coupon/receive/rule/list")
    Result getReceiveRuleList();

}