From eb30697ecb2ed35a477ee8ba15c5b778b94648bb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 31 May 2020 18:08:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
index 82e377e..989a8ca 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
@@ -17,6 +17,15 @@
 public class ContractHoldOrderEntity extends BaseEntity {
 
     /**
+     * 是否可平仓 1-是
+     */
+    public static final int ORDER_CAN_CLOSING_Y = 1;
+    /**
+     * 是否可平仓 0-否
+     */
+    public static final int ORDER_CAN_CLOSING_N = 0;
+
+    /**
      * 会员Id
      */
     private Long memberId;
@@ -107,4 +116,14 @@
     private BigDecimal forceClosingPrice;
 
     private int operateNo;
+
+    /**
+     * 是否可平仓 0-否 1-是
+     */
+    private int isCanClosing;
+
+    /**
+     * 批次号 队列平仓时使用,避免重复
+     */
+    public String batchNo;
 }

--
Gitblit v1.9.1