From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 23 八月 2024 16:20:08 +0800 Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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..7e1457b 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 @@ -10,12 +10,12 @@ /** * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� */ -@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-merge") +@FeignClient(name="phi-platform-user",path = "/phip",contextId = "phip-user-merge") public interface SPhipUserMergeService { /** * 鐢ㄦ埛鍚堝苟鏃ュ織 */ @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