Merge branch 'master' into whole

Helius

2020-09-01 1eac25bee9fa9b09ee25fc6a945ef1a47b3b4299

 src/main/java/com/xcong/excoin/modules/documentary/vo/TradeHistoryOrderInfoVo.java

@@ -59,13 +59,13 @@
   @ApiModelProperty("交易员")

   private String nickname;

   

   @ApiModelProperty("带单收益")

   @ApiModelProperty("带单总收益")

   private BigDecimal followerRewardAmount;

   

   @ApiModelProperty("带单收益率")

   @ApiModelProperty("带单总收益率")

   private BigDecimal followerRewardRatio;

   

   @ApiModelProperty("跟随人数")

   @ApiModelProperty("累计跟随人数")

   private int followerNumber;



}