From cf2348cea6505b3a3777827bb64b6310de010f2e Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期五, 28 四月 2023 18:40:44 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

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 113ab33..da189cd 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
@@ -3,6 +3,8 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class UserTagInfoDto extends BaseDto{
@@ -19,9 +21,21 @@
     /**鏍囩鍚嶇О*/
     private String tagName;
 
+    /**鏍囩绫诲瀷缂栧彿*/
+    private String tagTypeNo;
+
     /**鏍囩绫诲埆*/
     private String tagTypeName;
 
+    /**鐢ㄦ埛骞冲彴缂栧彿*/
+    private String platformCode;
+
+    /**鏍囩鍚嶇О鍖归厤鎼滅储*/
+    private List<String> tagNameAndList;
+
+    /**鏍囩鍚嶇О鍖呭惈鎼滅储*/
+    private List<String> tagNameOrList;
+
     public UserTagInfoDto() {
 
     }

--
Gitblit v1.8.0