From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java
index cef6ca0..122caa1 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java
@@ -16,6 +16,11 @@
/**鏍囩鍒嗙被鍚嶇О*/
private String name;
+ /**閫夋嫨鍊兼暟閲忥紝涓嶅～鏃犻檺鍒�*/
+ private Integer selectValue;
+ /**鍙嚜瀹氫箟鏍囩锛�0鍚�1鏄�*/
+ private Integer customRule;
+
/**鏍囩闆嗗悎*/
private List<LabelVo> labelList;
/**瀛愮被*/
@@ -25,8 +30,10 @@
public LabelTypeVo() {
}
- public LabelTypeVo(String id, String name) {
+ public LabelTypeVo(String id, String name,Integer selectValue,Integer customRule) {
this.id = id;
this.name = name;
+ this.selectValue = selectValue;
+ this.customRule = customRule;
}
}
--
Gitblit v1.8.0