From 6c457e8d113576e17cad24e051c13a746b69e20e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 05 Aug 2020 16:59:04 +0800
Subject: [PATCH] 20200805  代码提交

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |    4 ++--
 src/main/java/com/xcong/excoin/modules/documentary/vo/TradeFollowInfoVo.java                |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 24a6252..f1bde06 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -875,9 +875,9 @@
 					String phone = memberEntity.getPhone();
 					String email = memberEntity.getEmail();
 					if(StrUtil.isNotEmpty(phone)) {
-						myFollowTraderInfoVo.setAccount(phone);
+						myFollowTraderInfoVo.setNickName(phone);
 					}else {
-						myFollowTraderInfoVo.setAccount(email);
+						myFollowTraderInfoVo.setNickName(email);
 					}
 				}
 				
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..ceca5ec 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