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

Helius

2021-04-14 83dab684cb4db66e67d8d08adb2d6e05277a5e9b

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

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

    /**
     * 保证金