From d768d607e24628420c6416ac955e491e8d747d9d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 08 八月 2022 19:45:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 d6bd1a5..e982372 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
@@ -24,11 +24,20 @@
     /**鏍囩绫诲埆*/
     private String tagTypeName;
 
+    /**鐢ㄦ埛骞冲彴缂栧彿*/
+    private String platformCode;
+
     /**鏍囩鏍囪瘑鍖归厤鎼滅储*/
-    private List<String> tagIdAndList;
+    private List<String> tagNoAndList;
 
     /**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
-    private List<String> tagIdOrList;
+    private List<String> tagNoOrList;
+
+    /**鏍囩鍚嶇О鍖归厤鎼滅储*/
+    private List<String> tagNameAndList;
+
+    /**鏍囩鍚嶇О鍖呭惈鎼滅储*/
+    private List<String> tagNameOrList;
 
     public UserTagInfoDto() {
 

--
Gitblit v1.8.0