Merge branch 'master-prod-new' into master-test

ANDRU-PC\Andru

2023-09-26 5e625dec445f8bfa05470d2b0faf29a35a9a6067

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

@@ -39,4 +39,6 @@
    /**操作人*/
    private String operatorId;
    private String operatorName;
    /**是否过滤测试账号数据:0不过滤,1过滤*/
    private Integer isFilterTestAccount;
}