From 0e1b9299d32233d55d5e69b7508842e1fa385442 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 21 三月 2024 17:26:00 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java | 4 +++-
phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java
new file mode 100644
index 0000000..cad99c5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeAddVo.java
@@ -0,0 +1,37 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelTypeAddVo {
+
+ /**鏍囩鍒嗙被鏍囪瘑*/
+ private String id;
+ /**鏍囩鍒嗙被鍚嶇О*/
+ private String name;
+
+ /**閫夋嫨鍊兼暟閲忥紝涓嶅～鏃犻檺鍒�*/
+ private Integer selectValue;
+ /**鍙嚜瀹氫箟鏍囩锛�0鍚�1鏄�*/
+ private Integer customRule;
+
+ /**瀛愮被*/
+ private LabelTypeAddVo child;
+
+
+ public LabelTypeAddVo() {
+ }
+
+ public LabelTypeAddVo(String id, String name, Integer selectValue, Integer customRule) {
+ this.id = id;
+ this.name = name;
+ this.selectValue = selectValue;
+ this.customRule = customRule;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java
index a3c2105..7108ce6 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java
@@ -10,8 +10,10 @@
@Data
public class UserLabelTypeVo {
- /**绯荤粺鏍囩鍒嗙被鏍囪瘑-蹇呭～*/
+ /**绯荤粺鏍囩鍒嗙被鏍囪瘑-蹇呭～锛堣嚜鍔ㄦ墦鏍囩鍙┖锛�,璇ュ瓧娈垫瘮labelTypeAdd浼樺厛*/
private String labelTypeId;
+ /**鑷姩鐢熸垚鏍囩鍒嗙被-鑷姩鎵撴爣绛句娇鐢�*/
+ private LabelTypeAddVo labelTypeAdd;
/**鐢ㄦ埛鏍囩闆嗗悎*/
private List<UserLabelInfoVo> userLabelList;
--
Gitblit v1.8.0