Merge remote-tracking branch 'origin/master'

fhx

2023-06-13 1dc614742b2b8d16d8aac09045cf5b15d2057650

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