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

zainali5120

2021-04-28 ffca7fc095a9111837dfd82288faef450b749f69

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

@@ -205,4 +205,14 @@

    private int operateNo;

    /**
     * 维持保证金
     */
    private BigDecimal holdBond;

    /**
     * 全仓爆仓时批次
     */
    private String batchNo;

}