From 22c96f6b1cd3ebc7ec12e6556a48e1582639ddfd Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 12 四月 2023 17:01:53 +0800
Subject: [PATCH] Merge branch 'master' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
index 5f6ec34..5c13906 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
@@ -17,6 +17,10 @@
 @FeignClient(name="dcp-rules-service",path = "/dcp-rules",contextId = "userTagInfo")
 public interface SUserTagInfoService {
 
+    /** 鏍囩鍒嗙被鏍戝瀷鍒楄〃 */
+    @PostMapping("/tag/rule/info/list/tree")
+    Result listTreeData();
+
     /**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/
     @PostMapping("/user/tag/info/list")
     Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
@@ -38,7 +42,7 @@
      *                },
      *        {
      * 			(鏄惁鑷畾涔夋爣绛� 鏄�)"isCustom": 1,
-     * 			(鏍囩绫诲瀷缂栧彿 娌℃湁绫诲瀷鍙互涓虹┖鎴栦笉浼�)"typeNo": "constellation",
+     * 			(鏍囩缂栧彿 娌℃湁鍙互涓虹┖鎴栦笉浼�)"tagNo": "constellation",
      * 			(鏍囩缂栧彿)"tagName": "鐗涢┈搴�"
      *        }
      * 	],
@@ -60,4 +64,8 @@
     /**鏍囩鍒嗙被鏁版嵁鍒楄〃*/
     @PostMapping("/tag/rule/info/list")
     Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);
+
+    /**鍚屾鐢ㄦ埛鏍囩鏁版嵁*/
+    @PostMapping("/test/handlerSyncUserLabelInfo")
+    Result handlerSyncUserLabelInfo(@RequestParam("userId") String userId);
 }

--
Gitblit v1.8.0