Merge branch 'master' into whole

Helius

2020-09-01 1eac25bee9fa9b09ee25fc6a945ef1a47b3b4299

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

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

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

    @ApiModelProperty("已实现盈亏")
    private BigDecimal rewardAmount;