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

Andru

2024-01-18 01f6c4723da041da273b69dee0632091b634cff3

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

@@ -377,4 +377,11 @@
    @PostMapping(value = "/user/statement/details")
    Result statementDetails(@RequestBody UserDto userDto);


    /**
     * 查询用户最新的合并账号记录
     * */
    @PostMapping(value = "/user/merge/log")
    Result userMergeLog(@RequestBody UserDto userDto);

}