From 1a4b636cae41fdd15199beb1ea5df45b31de5b7d Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期三, 19 六月 2024 14:27:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

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

--
Gitblit v1.8.0