From 4c09626ac2ba3726efc767cd9f8b163b75f91d49 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 13 六月 2023 10:06:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new'

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   23 +++++++++++++++++++----
 1 files changed, 19 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 3ea198b..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,10 +1,7 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserInviteeInfoDto;
-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;
@@ -81,4 +78,22 @@
      */
     @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