From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
index ecad2f9..6c9d765 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
@@ -7,10 +7,12 @@
  */
 @Data
 public class UserLabelInfoVo {
+    /**鐢ㄦ埛鏍囩鏍囪瘑*/
+    private String id;
     /**鏄惁鑷畾涔夛細0鍚�1鏄�-蹇呭~*/
     private Integer isCustom;
     /**绯荤粺鏍囩鏍囪瘑-閫夊~锛坕sCustom鏄�0蹇呭~锛�*/
     private String labelId;
-    /**鏍囩鏍囪瘑-閫夊~锛坕sCustom鏄�1蹇呭~锛�*/
+    /**鏍囩鍚嶇О-閫夊~锛坕sCustom鏄�1蹇呭~锛�*/
     private String labelName;
 }

--
Gitblit v1.8.0