From 765007dcc802b0539124cb4c780de665e6665509 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期六, 06 五月 2023 14:56:25 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 d35d70e..9dfbb91 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,9 +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.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;
@@ -73,6 +71,17 @@
      * 鐢ㄦ埛鍗囩骇杩涘害
      */
     @PostMapping("user/level/progress")
-    Result userLevelProgress(@RequestBody JSONObject parmData);
+    Result userLevelProgress(@RequestBody JSONObject paramData);
 
+    /**
+     * 鐢ㄦ埛閭�璇蜂汉淇℃伅
+     */
+    @PostMapping("user/invitee/info")
+    Result userInviteeInfo(@RequestBody UserInviteeInfoDto userInviteeInfoDto);
+
+    /**
+     * 鐢ㄦ埛鍏虫敞浜у搧璁板綍
+     */
+    @PostMapping("/attention/product/record/edit")
+    Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0