From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 9a99d32..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);
+
/**
* 鑾峰彇鐢ㄦ埛瀛愰」鐩�
@@ -276,7 +283,7 @@
* 鑾峰彇鍒扮敤鎴�
*/
@PostMapping(value = "/user/sync/by/idList")
- Result userSyncList(@RequestParam("hisIdList") List<String> hisIdList);
+ Result userSyncList(@RequestBody List<String> hisIdList);
/**
* 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
@@ -327,4 +334,20 @@
* */
@PostMapping(value = "/user/rebate/userId")
Result queryRebateByUserId(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @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