Merge remote-tracking branch 'origin/master'

zainali5120

2020-05-31 a2d9bd16ac1106489572a5f7d8d70e1086d5406d

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

@@ -26,6 +26,26 @@
    public static final int ORDER_CAN_CLOSING_N = 0;

    /**
     * 开多
     */
    public static final int OPENING_TYPE_MORE = 1;

    /**
     * 开空
     */
    public static final int OPENING_TYPE_LESS = 2;

    /**
     * 交易类型 市价
     */
    public static final int TRADE_TYPE_MARK = 1;

    /**
     * 交易类型 限价
     */
    public static final int TRADE_TYPE_LIMIT = 2;

    /**
     * 会员Id
     */
    private Long memberId;
@@ -71,7 +91,7 @@
    private BigDecimal openingPrice;

    /**
     * 开仓类型 1-开多 2-开多
     * 开仓类型 1-开多 2-开空
     */
    private int openingType;

@@ -121,4 +141,9 @@
     * 是否可平仓 0-否 1-是
     */
    private int isCanClosing;

    /**
     * 批次号 队列平仓时使用，避免重复
     */
    public String batchNo;
}