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

wzy

2020-11-29 18ec469960104139455f8a3863e3c9e8fb1f32d2

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

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

    /**
     * 保证金