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

fwq

2023-08-16 af476e0830ea7c644f38dc569fcb0a60f96292a0

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

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

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

@@ -22,6 +22,6 @@
    /**生日券传:结束时间,年月日时分秒,不填默认一个月*/
    private String endTime;

    /**发送的用户*/
    private List<CouponSendUserDto> sendUserList;
    /**发送的券信息*/
    private List<CouponSendItemDto> couponList;
}