From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java
index 51abc4e..1da7e96 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java
@@ -17,5 +17,5 @@
* 鐢ㄦ埛鍚堝苟鏃ュ織
*/
@PostMapping("/user/merge/log/add")
- Result userMergeAdd(Request.Options options, @RequestBody UserMergeDto userMergeDto);
+ Result userMergeAdd(@RequestBody UserMergeDto userMergeDto);
}
\ No newline at end of file
--
Gitblit v1.8.0