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

Helius

2020-07-07 ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef

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

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

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

    public BigDecimal getOpeningFeeAmount() {
        return openingFeeAmount == null ? openingFeeAmount : openingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN);
    }


    public BigDecimal getClosingFeeAmount() {
        return closingFeeAmount == null ? closingFeeAmount : closingFeeAmount.setScale(8, BigDecimal.ROUND_DOWN);
    }

}