Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

Helius

2021-03-04 e0f37629f6fb0c7b62284e262ef60c5e0bcd82cd

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

@@ -64,6 +64,8 @@
     * 订单类型1普通合约2跟单合约
     */
    private int contractType;
    public static final int CONTRACTTYPE_NORMAL = 1;
    public static final int CONTRACTTYPE_DOCUMENTARY = 2;
    /**
     * 会员Id
     */
@@ -203,4 +205,14 @@

    private int operateNo;

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

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

}