From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

---
 src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsDealEntity.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsDealEntity.java b/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsDealEntity.java
index bc8d440..de6f514 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsDealEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsDealEntity.java
@@ -41,6 +41,13 @@
 	private Integer tradeType;
 	public static final Integer TRADETYPE_MARKETPRICE = 1;
 	public static final Integer TRADETYPE_FIXEDPRICE = 2;
+	
+	/**
+	 * 状态  2：撤单3：已成交
+	 */
+	private Integer orderStatus;
+	public static final Integer ORDERSTATUS_CANCEL = 2;
+	public static final Integer ORDERSTATUS_DONE = 3;
 	/**
 	 * 币种
 	 */

--
Gitblit v1.9.1