From 17fb78903b310564aaeea6e4fd50824f45d4677a Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Tue, 13 Oct 2020 15:55:39 +0800
Subject: [PATCH] Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv

---
 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