From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
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