Merge remote-tracking branch 'origin/whole' into whole

zainali5120

2020-10-25 bef3b23ca8918a355f6ff9751b46f4c35970f19e

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

@@ -14,7 +14,7 @@
   private Long id;

   

   @ApiModelProperty("名称")

    private String account;

    private String nickname;

   

    @ApiModelProperty(value = "累计跟随本金")

    private BigDecimal totalPrincipal;