Merge branch 'fhx-prod-用户建档' into master-prod-new

fhx

2023-08-03 6436fd1c4ba085e6aea2254071a324269b113ba9

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

@@ -21,4 +21,6 @@
    private String  roleId;
    /**角色表标识*/
    private String  roleTypeId;
    /**是否同门店*/
    private Integer isSameShop;
}