Merge remote-tracking branch 'origin/master-test' into master-test

fhx

2024-06-05 570e48eb85b3958f56ade7e58a1ab9ef5a4957ed

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