From 497d9399da3fe78f7ef1934f92953d00df3ac549 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 30 Jul 2020 15:02:55 +0800
Subject: [PATCH] Merge branch 'master' into follow

---
 src/main/java/com/xcong/excoin/modules/documentary/vo/FollowRecordsVo.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowRecordsVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowRecordsVo.java
index de61253..7cb6d16 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowRecordsVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowRecordsVo.java
@@ -29,15 +29,22 @@
     @ApiModelProperty(value = "跟随者ID")
     private Long memberId;
     /**
-     * 交易员ID
+     * 跟随者ID
      */
-    @ApiModelProperty(value = "交易员ID")
+    @ApiModelProperty(value = "交易者ID")
     private Long tradeId;
+    
     /**
-     * 交易员会员ID
+     * 头像
      */
-    @ApiModelProperty(value = "交易员会员ID")
-    private Long tradeMemberId;
+	@ApiModelProperty("头像")
+    private String avatar;
+    /**
+     * 名称
+     */
+	@ApiModelProperty("名称")
+    private String nickname;
+    
     /**
      * 累计跟随本金
      */
@@ -48,9 +55,5 @@
      */
     @ApiModelProperty(value = "累计收益")
     private BigDecimal totalProfit;
-    /**
-     * 是否跟随 1-是 2-否
-     */
-    @ApiModelProperty(value = "是否跟随 1-是 2-否")
-    private Integer isFollow;
+    
 }

--
Gitblit v1.9.1