From 1dfa76ad5143a3ddf5f7c4bf0c9fa0e27f6a9065 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 28 六月 2023 18:45:18 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 a1816d4..157b7c4 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
@@ -96,4 +96,16 @@
      */
     @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);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁$畻
+     */
+    @PostMapping(value = "/user/level/calc")
+    Result userLevelCalc(@RequestBody UserParamDto userParamDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0