Merge branch 'master-prod-new' into master-test

fhx

2023-08-15 e443c3280a5db30172f205f465ca3e3c8294decb

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