Merge branch 'fhx-prod-兑换优惠券' into master-test

fhx

2023-06-29 9ae1308afe817d5d7a49d58fb24f9fb51c485f9d

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -26,4 +26,6 @@
    private String startTime;
    /**结束时间*/
    private String endTime;
    /**类型*/
    private Integer type;
}