fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 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;