Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-12 335ec6398bb70d60a765b4782376e8141cbfa9cf

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

@@ -146,4 +146,9 @@
     * 批次号 队列平仓时使用，避免重复
     */
    public String batchNo;

    /**
     * 持仓费
     */
    private BigDecimal holdAmount;
}