From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

---
 src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 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 2dacc51..5a81616 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
@@ -82,12 +82,35 @@
     /**
      * 是否满员 1-是2-否
      */
-	@ApiModelProperty("是否满员 1-是2-否")
+	@ApiModelProperty("交易员是否设置满员 1-是2-否")
     private Integer isAll;
+	/**
+     * 是否满员 1-是2-否
+     */
+	@ApiModelProperty("实际是否满员 1-是2-否")
+    private Integer isActualAll;
     /**
      * 跟单状态 1:已跟单2:未跟单
      */
 	@ApiModelProperty("跟单状态 1:已跟单2:未跟单")
     private Integer documentaryType;
+	
+	/**
+     * 最大跟单人数
+     */
+	@ApiModelProperty("最大跟单人数")
+    private Integer followNum;
+	
+	/**
+     * 当前跟单人数
+     */
+	@ApiModelProperty("当前跟单人数")
+    private Integer followNumNow;
+	
+	/**
+     * 入驻天数(从审核通过开始计算)
+     */
+	@ApiModelProperty("入驻天数")
+    private Integer entryDays;
 
 }

--
Gitblit v1.9.1