Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2023-08-23 b0f290df690b64c9d96458a7a5a5f836ed338689

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