fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java

@@ -47,6 +47,9 @@
    @ApiModelProperty(value = "张数")
    private int symbolCnt;

    @ApiModelProperty(value = "可平张数")
    private int symbolCntSale;

    @ApiModelProperty(value = "回报率")
    private BigDecimal returnRate;