From a00d810984fe187d24e442d5f557bcc271cfa3ce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 Jan 2021 11:25:49 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 dbb381c..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,15 +74,20 @@
*/
@ApiModelProperty("宣言")
private String declaration;
+ /**
+ * 标签
+ */
+ @ApiModelProperty("标签")
+ private List<FollowTraderLabelEntity> labels;
/**
* 是否满员 1-是2-否
*/
@ApiModelProperty("是否满员 1-是2-否")
private Integer isAll;
/**
- * 是否开启带单 1是2否
+ * 跟单状态 1：已跟单2：未跟单
*/
- @ApiModelProperty("是否开启带单 1是2否")
- private Integer isOpen;
+ @ApiModelProperty("跟单状态 1：已跟单2：未跟单")
+ private Integer documentaryType;
}
--
Gitblit v1.9.1