From 9574cd990b7e32f966edc45824f8f952b5215d58 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 18 七月 2023 19:58:49 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java |   14 ++++++++++++++
 1 files changed, 14 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 ab4bd11..8863d6e 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
@@ -19,6 +19,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
@@ -271,6 +273,12 @@
     Result userInfoBaseInfo(@RequestParam("userId") String userId);
 
     /**
+     * 鑾峰彇鍒扮敤鎴�
+     */
+    @PostMapping(value = "/user/sync/by/idList")
+    Result userSyncList(@RequestBody List<String> hisIdList);
+
+    /**
      *  鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
      * @param userDto userId
      * @return
@@ -319,4 +327,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