From 335ec6398bb70d60a765b4782376e8141cbfa9cf Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Mon, 12 Oct 2020 16:01:53 +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/entity/OrderCoinsEntity.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsEntity.java b/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsEntity.java
index 54cadd8..f536c5d 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsEntity.java
@@ -57,6 +57,11 @@
 	 * 成交价
 	 */
 	private BigDecimal dealPrice;
+
+	/**
+	 *  市价委托时的委托金额
+	 */
+	private BigDecimal entrustAmount;
 	/**
 	 * 成交金额
 	 */

--
Gitblit v1.9.1