From 7e23d3af0996ffbf81d697b7463955976cd1e86e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 15 十一月 2023 11:42:00 +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/phis/SUserService.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 8863d6e..5c118f0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -257,6 +257,13 @@
     @PostMapping(value = "/user/crowd/import")
     Result userCrowdImport(@RequestBody UserDto userDto);
 
+    /**
+     * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+     * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+     */
+    @PostMapping(value = "/user/crowd/import/new")
+    Result userCrowdImportNew(@RequestBody UserPackListDto userPackListDto);
+
 
     /**
      * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
@@ -333,4 +340,14 @@
      * */
     @PostMapping(value = "/user/query/oldNewPerformance")
     Result queryOldNewPerformance(@RequestBody UserDto userDto);
+
+
+    @PostMapping(value = "/user/draw/list")
+    Result drawGetUserDt(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛绉戝鍏崇郴
+     * */
+    @PostMapping(value = "/user/room/list")
+    Result userRoomList(@RequestBody UserDto userDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0