Merge branch 'prod-扫码登记' into master-prod-new

rx

2023-07-04 04c102325048c0715edc4de114bfaef4f36719e5

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