Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

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

@@ -58,5 +58,14 @@
   

   @ApiModelProperty("交易员")

   private String nickname;

	
   @ApiModelProperty("带单总收益")

   private BigDecimal followerRewardAmount;

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

   private BigDecimal followerRewardRatio;

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

   private int followerNumber;



}