From 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 30 六月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
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