Merge remote-tracking branch 'origin/master'

zainali5120

2020-05-31 a2d9bd16ac1106489572a5f7d8d70e1086d5406d

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

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

    /**
     * 保证金