Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

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

@@ -16,11 +16,13 @@
    /**是否发送短信0否1是-默认否*/
    private Integer isSendMsg = 0;

    /**消耗储值金*/
    /**消耗总储值金*/
    private BigDecimal storedValueFund;
    /**消耗增值金*/
    /**消耗总增值金*/
    private BigDecimal valueAddedFund;
    /**消耗积分*/
    /**消耗总积分*/
    private BigDecimal integral;

    /**发送的券*/
    private List<CouponSendItemDto> couponList;
}