Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-07 ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef

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

@@ -58,7 +58,7 @@
    /**
     * 仓位类型 1-逐仓 2-全仓
     */
    private int potionType;
    private int positionType;

    /**
     * 交易类型 1-市价 2-限价
@@ -146,4 +146,9 @@
     * 批次号 队列平仓时使用，避免重复
     */
    public String batchNo;

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