From c14ef66fa5e588f9b1a7424a5b4bc377762cc043 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 25 十二月 2023 18:21:16 +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 | 13 +++++--------
1 files changed, 5 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..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,22 +21,19 @@
/**鏍囩鍚嶇О*/
private String tagName;
+ /**鏍囩绫诲瀷缂栧彿*/
+ private String tagTypeNo;
+
/**鏍囩绫诲埆*/
private String tagTypeName;
/**鐢ㄦ埛骞冲彴缂栧彿*/
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