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

zainali5120

2021-05-12 2720d8d8e2ea1a03e6dd42809d75f788349f66c8

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

@@ -32,7 +32,7 @@
   private Integer followCnt;

   

   @ApiModelProperty(value = "跟单最大持仓张数数量", example = "2")

   private int maxFollowCnt;

   private String maxFollowCnt;



   public BigDecimal getProfit() {

      return profit.multiply(BigDecimal.valueOf(1));