From 55dc3707715ed7213163f4c8a0bf79c6a6f4dc63 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 六月 2023 14:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 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..a1816d4 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,29 @@
* 鐢ㄦ埛鍗囩骇杩涘害
*/
@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);
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info")
+ Result getUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-淇敼鐢ㄦ埛绉戝鍏崇郴淇℃伅
+ */
+ @PostMapping(value = "/user/families/room/info/update")
+ Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
--
Gitblit v1.8.0