Merge remote-tracking branch 'origin/master'

fhx

2023-06-13 1dc614742b2b8d16d8aac09045cf5b15d2057650

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