From 30e49b0e5164d16a65337201a449e5034166e298 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 22 三月 2023 17:35:17 +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 | 7 +++++++ 1 files changed, 7 insertions(+), 0 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 2336000..84c0945 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,6 +2,7 @@ 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; @@ -74,4 +75,10 @@ */ @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