From fcf8b677cf0a8165da424b642a9ade51aa91e7e9 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 23 三月 2023 18:31:56 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6 ------
1 files changed, 0 insertions(+), 6 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..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,7 +2,6 @@
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;
@@ -76,9 +75,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