Merge branch 'master-prod-new' into master-test

fwq

2024-05-31 ce05f93873f62806ebc52952e777cb3f9d640eb5

Merge branch 'master-prod-new' into master-test

 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();

}

 phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java

New file
@@ -0,0 +1,15 @@
package com.hz.his.vo.coupon;

import lombok.Data;

/**
 *  优惠券领取规则
 * */
@Data
public class CouponReceiveVo {
    /**规则标识*/
    private String id;
    /**规则名称*/
    private String name;

}