From 653a27e1cc457f7bc887a6aa81ff00717e4282f4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 13 六月 2024 10:33:52 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-爆款活动2.0

---
 phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 1ed9883..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,10 +11,16 @@
 @Data
 public class LabelVo {
 
-    /**鏍囩鏍囪瘑*/
+    /**鐢ㄦ埛鏍囩鏍囪瘑*/
     private String id;
+    /**绯荤粺鏍囩鏍囪瘑*/
+    private String labelId;
+    /**绯荤粺鏍囩鍒嗙被鏍囪瘑*/
+    private String labelTypeId;
     /**鏍囩鍚嶇О*/
     private String name;
+    /**鏄惁鑷畾涔夋爣绛撅細0鍚�1鏄�*/
+    private Integer isCustom;
 
     public LabelVo() {
     }
@@ -23,4 +29,12 @@
         this.id = id;
         this.name = name;
     }
+
+    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