From 93f666908b8b84336aed251a1cc22b49b5c4b12f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:48 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin 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