Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-06-08 721ff590530a58936500e55db9212f33ce16f427

 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;
}