Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-04-28 ffca7fc095a9111837dfd82288faef450b749f69

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

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

    /**
     * 保证金