From 174051f74a5842466c68c0601832fbb5a952608e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 十二月 2022 18:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 7 ++++++-
1 files changed, 6 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 74fe34b..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 鏄姹傛帴鍙ｅ墠缂�
@@ -18,6 +19,10 @@
/**鏌ヨ鐢ㄦ埛鏍囩鍒楄〃*/
@PostMapping("/user/tag/info/list")
Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
+
+ /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖(FilterUserDto)*/
+ @RequestMapping("/user/tag/info/user/list")
+ Result userListData(@RequestBody UserTagInfoDto userTagInfoDto);
/**
* 缂栬緫鐢ㄦ埛鏍囩 娣诲姞 缂栬緫 鍒犻櫎 涓夊悎涓�鎺ュ彛
@@ -53,5 +58,5 @@
/**鏍囩鍒嗙被鏁版嵁鍒楄〃*/
@PostMapping("/tag/rule/info/list")
- Result listData(TagRuleInfoDto tagRuleInfoDto);
+ Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);
}
--
Gitblit v1.8.0