From 7918b04206c4879f098789c619a4d5637906856d Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 03 十月 2023 22:29:59 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 9 +++------
1 files changed, 3 insertions(+), 6 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 e982372..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,14 @@
/**鏍囩鍚嶇О*/
private String tagName;
+ /**鏍囩绫诲瀷缂栧彿*/
+ private String tagTypeNo;
+
/**鏍囩绫诲埆*/
private String tagTypeName;
/**鐢ㄦ埛骞冲彴缂栧彿*/
private String platformCode;
-
- /**鏍囩鏍囪瘑鍖归厤鎼滅储*/
- private List<String> tagNoAndList;
-
- /**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
- private List<String> tagNoOrList;
/**鏍囩鍚嶇О鍖归厤鎼滅储*/
private List<String> tagNameAndList;
--
Gitblit v1.8.0