From 6d885783878f73a00048a391b42d90bd54fd4ca1 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 23 三月 2023 11:31:43 +0800
Subject: [PATCH] 优化

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java      |    2 --
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMergeService.java |    2 +-
 2 files changed, 1 insertions(+), 3 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
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index e076a63..d35d70e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -2,12 +2,10 @@
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.user.UserListDto;
-import com.hz.his.dto.user.UserMergeDto;
 import com.hz.his.dto.user.UserParamDto;
 import com.hz.his.dto.user.UserUnionDto;
 import com.hz.his.dto.user.coupon.UserCouponDto;
 import com.hz.his.dto.user.project.UserProjectDto;
-import feign.Request;
 import net.sf.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

--
Gitblit v1.8.0