From 599ef2e379d11b4be517f0c38cd504c9395f0297 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 23 三月 2023 11:27:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new-合并账号' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
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 84c0945..e076a63 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
@@ -7,6 +7,7 @@
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;
@@ -76,9 +77,4 @@
@PostMapping("user/level/progress")
Result userLevelProgress(@RequestBody JSONObject parmData);
- /**
- * 鐢ㄦ埛鍗囩骇杩涘害
- */
- @PostMapping("/user/merge/log/add")
- Result userMergeAdd(@RequestBody UserMergeDto userMergeDto);
}
\ No newline at end of file
--
Gitblit v1.8.0