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

xiaoyong931011

2020-05-31 ef1ee6b8fc046edc8f7cc8ead3f3f293da190b0d

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

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

    /**
     * 保证金