From 00dc68cd8a661b4795c5775a0c9c2eb3de10c94e Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期五, 01 九月 2023 17:34:33 +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 |   13 +++++++++++++
 1 files changed, 13 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 b9590e6..6309cc7 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);
+
 
     /**
      * 鑾峰彇鐢ㄦ埛瀛愰」鐩�
@@ -327,4 +334,10 @@
      * */
     @PostMapping(value = "/user/rebate/userId")
     Result queryRebateByUserId(@RequestBody UserDto userDto);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛绱杩斾剑
+     * */
+    @PostMapping(value = "/user/query/oldNewPerformance")
+    Result queryOldNewPerformance(@RequestBody UserDto userDto);
 }
\ No newline at end of file

--
Gitblit v1.8.0