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

fwq

2023-08-16 d14e123d94b47d372ad1222829b3c8f3882515cd

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

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java

@@ -13,8 +13,8 @@
public class CouponSendUserDto {
    /**phis用户标识-必填*/
    private String userId;
    /**是否发送-默认否*/
    private Integer isSendSMS;
    /**是否发送短信0否1是-默认否*/
    private Integer isSendMsg = 0;

    /**消耗储值金*/
    private BigDecimal storedValueFund;