fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 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;



}