From 422e6d3b1330d15ac391a73ac0c1ca6ff6f87425 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 20 三月 2024 11:23:45 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java | 7 +++++--
1 files changed, 5 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..c5ef966 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,10 @@
@Data
public class LabelVo {
- /**鏍囩鏍囪瘑*/
+ /**鐢ㄦ埛鏍囩鏍囪瘑*/
private String id;
+ /**鏍囩鏍囪瘑*/
+ private String labelId;
/**鏍囩鍚嶇О*/
private String name;
/**鏄惁鑷畾涔夋爣绛撅細0鍚�1鏄�*/
@@ -26,8 +28,9 @@
this.name = name;
}
- public LabelVo(String id, String name, Integer isCustom) {
+ public LabelVo(String id,String labelId, String name, Integer isCustom) {
this.id = id;
+ this.labelId = labelId;
this.name = name;
this.isCustom = isCustom;
}
--
Gitblit v1.8.0