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

fhx

2023-08-29 4829593daa194b175e9e914634d352c7c4f0ffc6

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

@@ -32,5 +32,8 @@
    private Integer isSendSMS;
    /**数量发送优惠券数量*/
    private Integer amount;

    /**开始时间*/
    private String startTime;
    /**结束时间*/
    private String endTime;
}