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

fwq

2023-10-27 06443da28c793cf6b58c05fb6ac97eb552862437

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

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java

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

@@ -344,4 +344,10 @@

    @PostMapping(value = "/user/draw/list")
    Result drawGetUserDt(@RequestBody UserDto userDto);

    /**
     * 查询用户科室关系
     * */
    @PostMapping(value = "/user/room/list")
    Result userRoomList(@RequestBody UserDto userDto);
}