Merge branch 'master' into whole_new

Helius

2020-09-10 6b9b8b50fbefd21479197ccfa9abfe039e04f1d6

 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;