From 1c744733a032b1da5d429830268a6314b39eba09 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 23 十一月 2022 18:34:40 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 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 0975bf8..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,16 +27,10 @@
     /**鐢ㄦ埛骞冲彴缂栧彿*/
     private String platformCode;
 
-    /**鏍囩鏍囪瘑鍖归厤鎼滅储*/
-    private List<String> tagNoAndList;
-
-    /**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
-    private List<String> tagNoOrList;
-
-    /**鏍囩鏍囪瘑鍖归厤鎼滅储*/
+    /**鏍囩鍚嶇О鍖归厤鎼滅储*/
     private List<String> tagNameAndList;
 
-    /**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
+    /**鏍囩鍚嶇О鍖呭惈鎼滅储*/
     private List<String> tagNameOrList;
 
     public UserTagInfoDto() {

--
Gitblit v1.8.0