From 599cb3a300878dc8b3a579f967fbad4a7eb536e7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 27 十月 2023 16:07:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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 e982372..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
@@ -21,17 +21,14 @@
     /**鏍囩鍚嶇О*/
     private String tagName;
 
+    /**鏍囩绫诲瀷缂栧彿*/
+    private String tagTypeNo;
+
     /**鏍囩绫诲埆*/
     private String tagTypeName;
 
     /**鐢ㄦ埛骞冲彴缂栧彿*/
     private String platformCode;
-
-    /**鏍囩鏍囪瘑鍖归厤鎼滅储*/
-    private List<String> tagNoAndList;
-
-    /**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
-    private List<String> tagNoOrList;
 
     /**鏍囩鍚嶇О鍖归厤鎼滅储*/
     private List<String> tagNameAndList;

--
Gitblit v1.8.0