From 0eb67c3b6badf538c959a5e68d293515720187c8 Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期五, 28 四月 2023 18:22:12 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 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..0e9fc67 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 @@ -1,10 +1,7 @@ package com.hz.his.feign.service.platform; 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.*; import com.hz.his.dto.user.coupon.UserCouponDto; import com.hz.his.dto.user.project.UserProjectDto; import net.sf.json.JSONObject; @@ -74,11 +71,17 @@ * 鐢ㄦ埛鍗囩骇杩涘害 */ @PostMapping("user/level/progress") - Result userLevelProgress(@RequestBody JSONObject parmData); + Result userLevelProgress(@RequestBody JSONObject paramData); /** - * 鐢ㄦ埛鍗囩骇杩涘害 + * 鐢ㄦ埛閭�璇蜂汉淇℃伅 */ - @PostMapping("/user/merge/log/add") - Result userMergeAdd(@RequestBody UserMergeDto userMergeDto); + @PostMapping("user/invitee/info") + Result userInviteeInfo(@RequestBody UserInviteeInfoDto userInviteeInfoDto); + + /** + * 鐢ㄦ埛鍏虫敞浜у搧璁板綍 + */ + @PostMapping("/attention/product/edit") + Result userAttentionProductRecord(@RequestBody UserAttentionProductDto userAttentionProductDto); } \ No newline at end of file -- Gitblit v1.8.0