From 54a6617f944e072a62bc90c54772a68003fb98fc Mon Sep 17 00:00:00 2001
From: wzh <zhuhaow@phiskin.com>
Date: 星期三, 10 八月 2022 14:44:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 6 ------
phis-feign/src/main/java/com/hz/his/dto/dcp/FilterUserTagInfoDto.java | 29 +++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 2 +-
3 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/FilterUserTagInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/FilterUserTagInfoDto.java
new file mode 100644
index 0000000..36702fb
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/FilterUserTagInfoDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.dcp;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鏍囩绛涢�夌敤鎴锋暟鎹瓺to
+ */
+@Data
+public class FilterUserTagInfoDto {
+
+ /**鎺掑簭鍏抽敭淇℃伅 鍐呭寘鍚�(userId platformCode) 鎺掑簭缁撴灉*/
+ private JSONObject id;
+
+ /**鐢ㄦ埛缂栧彿*/
+ private String userNo;
+
+ /**鐢ㄦ埛鍚嶇О*/
+ private String userName;
+
+ /**鏍囩鍒楄〃*/
+ private List<String> tagList;
+
+ public FilterUserTagInfoDto() {
+
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
index e982372..5933add 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
@@ -27,12 +27,6 @@
/**鐢ㄦ埛骞冲彴缂栧彿*/
private String platformCode;
- /**鏍囩鏍囪瘑鍖归厤鎼滅储*/
- private List<String> tagNoAndList;
-
- /**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
- private List<String> tagNoOrList;
-
/**鏍囩鍚嶇О鍖归厤鎼滅储*/
private List<String> tagNameAndList;
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 9251ceb..8f09928 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
@@ -20,7 +20,7 @@
@PostMapping("/user/tag/info/list")
Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);
- /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖鐢ㄦ埛id鏁扮粍*/
+ /**鏌ヨ鐢ㄦ埛鏍囩鐢ㄦ埛鍒楄〃 杩斿洖(FilterUserTagInfoDto)*/
@RequestMapping("/user/tag/info/user/list")
Result userListData(@RequestBody UserTagInfoDto userTagInfoDto);
--
Gitblit v1.8.0