From 495e9dcc80d830d9da9ad677f5c245b5fc4cbfa6 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 22 Apr 2021 14:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity

---
 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 ceca5ec..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 nickName;
+    private String nickname;
 	
     @ApiModelProperty(value = "累计跟随本金")
     private BigDecimal totalPrincipal;

--
Gitblit v1.9.1