Merge remote-tracking branch 'origin/master'

fhx

2023-06-13 1dc614742b2b8d16d8aac09045cf5b15d2057650

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