Merge branch 'master' into master-test

wangrenhuang

2023-05-16 4c9f508b53662ca8280a92f128250de1dc5dd570

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