From 01f6c4723da041da273b69dee0632091b634cff3 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期四, 18 一月 2024 10:03:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index a9f3bc8..88939d7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/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);
+
}
\ No newline at end of file
--
Gitblit v1.8.0