Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/cho...

gao

2020-07-01 5075b4fc794a0af66fc3df53f75cdf44f108ff90

 src/main/java/com/xcong/excoin/modules/contract/entity/ContractEntrustOrderEntity.java

@@ -82,7 +82,7 @@
    /**
     * 杠杆倍率
     */
    private BigDecimal leverRatio;
    private int leverRatio;

    /**
     * 保证金