From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 5393a67..4068a6b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -15,7 +15,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "employee")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "employee")
 public interface SEmployeeService {
 
     /**
@@ -27,6 +27,13 @@
     Result getEmpDetail(@RequestParam("empId") String empId);
 
     /**
+     * 鑾峰彇鍛樺伐璇︽儏
+     * @return Result
+     */
+    @PostMapping(value = "/emp/detail/byNoOrId")
+    Result getEmpDetailByIdOrNo(@RequestBody EmployeeDto employeeDto);
+
+    /**
      * 鏌ヨ鍛樺伐鍒楄〃
      */
     @PostMapping(value = "/emp/page/list")

--
Gitblit v1.8.0