From 1e54931e0a5f12f5c1125b30abfef378c050bd4d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 09 八月 2022 17:38:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 6 ++++++
1 files changed, 6 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 2990f96..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
@@ -33,6 +33,12 @@
/**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
private List<String> tagNoOrList;
+ /**鏍囩鍚嶇О鍖归厤鎼滅储*/
+ private List<String> tagNameAndList;
+
+ /**鏍囩鍚嶇О鍖呭惈鎼滅储*/
+ private List<String> tagNameOrList;
+
public UserTagInfoDto() {
}
--
Gitblit v1.8.0