From 8b72bd6ea00340d0f0c22b2f6f3ed315c74a2203 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 08 十一月 2022 15:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 d2c5b18..b645b90 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
@@ -8,6 +8,7 @@
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
@@ -19,6 +20,10 @@
     @PostMapping("/user/tag/info/list")
     Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
 
+    /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖(FilterUserDto)*/
+    @RequestMapping("/user/tag/info/user/list")
+    Result userListData(@RequestBody UserTagInfoDto userTagInfoDto);
+
     /**
      * 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎  涓夊悎涓�鎺ュ彛
      * 鏁版嵁妗堜緥锛�

--
Gitblit v1.8.0