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

chenjiahe

2023-08-14 e023b237419249348ca4936a374197166779f066

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