From 03b606bcd56a04c6ea92b8af515a9fef97b84a7a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 十月 2023 16:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 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 6745f14..ca639b0 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
@@ -85,7 +85,33 @@
     @PostMapping("/attention/product/record/edit")
     Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);
 
-    /*鐢ㄦ埛鍗囩骇杩涘害鏂规硶*/
-    @PostMapping(value = "/user/level/progress")
-    Result userLevelProgress(@RequestBody UserParamDto userParamDto);
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛绉戝鍏崇郴淇℃伅
+     */
+    @PostMapping(value = "/user/families/room/info")
+    Result getUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-淇敼鐢ㄦ埛绉戝鍏崇郴淇℃伅
+     */
+    @PostMapping(value = "/user/families/room/info/update")
+    Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁$畻
+     */
+    @PostMapping(value = "/user/level/calc")
+    Result userLevelCalc(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鐨勫叕浼楀彿淇℃伅
+     */
+    @PostMapping(value = "/user/gzh/info")
+    Result userGZHInfo(@RequestBody UserParamDto userParamDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鑾峰彇crm灏忕▼搴忚烦杞摼鎺�
+     */
+    @PostMapping(value = "/user/crm/url/link")
+    Result getCRMUrlLink(@RequestBody UserUnionDto userParamDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0