Merge branch 'master' into master-test

wangrenhuang

2023-04-18 cc35e61d33b2421344bb22eb1ba50d093eacb562

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

@@ -12,6 +12,10 @@
public class EmployeeReportDto {
    /**员工标识*/
    private String employeeId;
    /**门店标识*/
    private String shopId;
    /**登录员工唯一字符串*/
    private String roleStr;
    /**员工标识集合*/
    private List<String> employeeIdList;
    /**门店标识集合*/