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

fwq

2024-02-05 9fd19bf6b3f7377e39708e929c811f66463f1bfd

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