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

Helius

2020-07-09 c03c9ec120c24f077a4805f8cf88cf17bb9d922e

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

@@ -64,12 +64,12 @@
    private Integer tradeType;

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


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

}