From 11da022b7d27bb27860f0978fbec0357302ac25b Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 12 八月 2024 11:18:23 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
index 98ef5c6..502e0a5 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
@@ -11,7 +11,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "label")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "label")
 public interface SLabelService {
 
 
@@ -31,11 +31,17 @@
 
 
     /**
-     * 鑾峰彇鏍囩鍒嗙被鏍戠姸鍚爣绛�
-     * @return Result
+     * 鑾峰彇鏍囩鍒嗙被鏍戠姸鍚爣绛撅紙鏍规嵁鑼冨洿鑾峰彇锛�
+     * @return Result鐨刣ata杞垚LabelTypeVo鐨勯泦鍚�
      */
     @PostMapping(value = "/label/type/tree/by-label")
     Result getLabelTypeTreeByLabel(@RequestBody LabelFindVo labelFindVo);
 
+    /**鏍规嵁鑼冨洿鑾峰彇
+     * 鑾峰彇鐢ㄦ埛鏍囩
+     * @return Result鐨刣ata杩斿洖鐨勬牸寮忥細key鍊硷細鍒嗙被鏍囪瘑锛泇alue:LabelVo鐨勯泦鍚�
+     */
+    @PostMapping(value = "/label/user/label")
+    Result getLabelUserLabel(@RequestBody LabelFindVo labelFindVo);
 
 }

--
Gitblit v1.8.0