Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-07 b3202206cbd19dc981ad262c11d8ee10c8937f35

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

@@ -60,4 +60,6 @@
    @ApiModelProperty("强平价")
    private BigDecimal forceClosingPrice;

    @ApiModelProperty(value = "交易类型 1-市价 2-限价")
    private Integer tradeType;
}