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/LabelVo.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
index c63bd87..2781674 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
@@ -11,8 +11,12 @@
@Data
public class LabelVo {
- /**鏍囩鏍囪瘑*/
+ /**鐢ㄦ埛鏍囩鏍囪瘑*/
private String id;
+ /**绯荤粺鏍囩鏍囪瘑*/
+ private String labelId;
+ /**绯荤粺鏍囩鍒嗙被鏍囪瘑*/
+ private String labelTypeId;
/**鏍囩鍚嶇О*/
private String name;
/**鏄惁鑷畾涔夋爣绛撅細0鍚�1鏄�*/
@@ -26,8 +30,10 @@
this.name = name;
}
- public LabelVo(String id, String name, Integer isCustom) {
+ public LabelVo(String id,String labelTypeId,String labelId, String name, Integer isCustom) {
this.id = id;
+ this.labelTypeId = labelTypeId;
+ this.labelId = labelId;
this.name = name;
this.isCustom = isCustom;
}
--
Gitblit v1.8.0