From 805da278f9719a355b3d730ef894708086d27270 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Sep 2020 10:08:43 +0800
Subject: [PATCH] Merge branch 'master' into whole

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

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java
index 77291d0..f2c0471 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java
@@ -14,7 +14,7 @@
 	private Long id;
 	
 	@ApiModelProperty("名称")
-    private String account;
+    private String nickname;
 	
     @ApiModelProperty(value = "累计跟随本金")
     private BigDecimal totalPrincipal;

--
Gitblit v1.9.1