From cb6bf31330bd994e65879ccea31877d2e05c79ea Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 17 Mar 2021 19:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
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