From 87e5906636e9c3dc56e716833c3b315c24def707 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 07 六月 2024 15:11:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-新版回访
---
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