From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole

---
 src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java
index 649f2a5..0b5d4a7 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java
@@ -63,6 +63,12 @@
 	@ApiModelProperty(value = "成交金额")
 	private BigDecimal dealAmount;
 	/**
+	 * 状态  2：撤单3：已成交
+	 */
+	@ApiModelProperty(value = "状态  2：撤单3：已成交")
+	private Integer orderStatus;
+	
+	/**
 	 * 手续费
 	 */
 	@ApiModelProperty(value = "手续费")

--
Gitblit v1.9.1