Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

 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;