From eeb29e79eb51059f81dc9c2b862e25e81ae8767b Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期日, 07 四月 2024 17:40:16 +0800
Subject: [PATCH] Merge branch 'fhx-prod-CRM预约' into master-test

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

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