Merge branch 'master' into master-test

wangrenhuang

2023-12-27 638acfcece12940e559e953cd23e8017094871d4

Merge branch 'master' into master-test

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

}