From 7a512d4a8b10fad9fb0aa75d6105955f033e1ee9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 07 六月 2024 15:37:22 +0800
Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' 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