From ea326544dc2b289156cdfc0c272cb5a5dda4164b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 27 Jan 2021 18:30:47 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 1b24b68..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;
@@ -76,7 +78,7 @@
* 标签
*/
@ApiModelProperty("标签")
- private String labels;
+ private List<FollowTraderLabelEntity> labels;
/**
* 是否满员 1-是2-否
*/
--
Gitblit v1.9.1