Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

xiaoyong931011

2021-05-12 436f7fa4d6ec2dee3b0c859ea7b7eef2369437ca

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

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

    /**
     * 保证金