Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-04-28 0eb67c3b6badf538c959a5e68d293515720187c8

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java

@@ -15,6 +15,10 @@
    private String updateTime;
    /**员工企业userId*/
    private String userId;
    /**角色唯一字符串*/
    private String uniqueStr;
    /**预约门店标识*/
    private String shopId;
    /**员工角色唯一标识数组*/
    private List<String> roleList;
}