From 6ca12260de4738b276769940aac49be024fd6f32 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 28 六月 2023 18:18:53 +0800
Subject: [PATCH] Merge branch 'prod-扫码登记' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 22 +++++++++++++++++++---
1 files changed, 19 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..29466a8 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,23 @@
@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);
+
+
+ /**
+ * 寮�鏀惧钩鍙�- 鐢ㄦ埛鎵爜鐧昏妯″潡 娉ㄥ唽缁戝畾鍚庡垱寤篽is鍔╂墜灏忕▼搴忕爜(UserCreateMpQrcodeController-bindCreateHisQrcode鏂规硶)
+ */
+ @PostMapping(value = "/user/mp/qrcode/create/his")
+ Result bindCreateHisQrcode(@RequestBody com.alibaba.fastjson.JSONObject jsonObject);
+
}
\ No newline at end of file
--
Gitblit v1.8.0