From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

---
 src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
index 1aef5ca..2dacc51 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
@@ -1,8 +1,10 @@
 package com.xcong.excoin.modules.documentary.vo;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import com.xcong.excoin.common.system.base.BaseEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +74,11 @@
      */
 	@ApiModelProperty("宣言")
     private String declaration;
+	/**
+	 * 标签
+	 */
+	@ApiModelProperty("标签")
+	private List<FollowTraderLabelEntity> labels;
     /**
      * 是否满员 1-是2-否
      */

--
Gitblit v1.9.1