Merge branch 'master-prod-new'

ANDRU-PC\Andru

2023-06-12 68e699bfa23a991376db2738c01dec463c0a6a29

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java

@@ -64,7 +64,7 @@
    @PostMapping(value = "/emp/role/liset")
    Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);

    /**员工-角色列表*/
    /**获取员工-角色列表*/
    @PostMapping(value = "/emp/role/info/list")
    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);