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/MemberAccountMoneyChange.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/entity/MemberAccountMoneyChange.java b/src/main/java/com/xcong/excoin/modules/coin/entity/MemberAccountMoneyChange.java
index 8a893f9..35f5d7a 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/entity/MemberAccountMoneyChange.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/entity/MemberAccountMoneyChange.java
@@ -27,8 +27,6 @@
     public static final Integer STATUS_SUCCESS_INTEGER = 1;
     public static final Integer STATUS_FAIL_INTEGER = 2;
     
-    private Long id;
-	
 	private Long memberId;
 	
 	/**
@@ -39,11 +37,7 @@
 	/**
 	 * 金额
 	 */
-	private BigDecimal price;
-	/**
-	 * 时间
-	 */
-	private Date time;
+	private BigDecimal amount;
 	/**
 	 * 记录内容
 	 */
@@ -56,5 +50,9 @@
 	 * 状态【0:待审核 1:成功2:失败】
 	 */
 	private int status;
+	/**
+	 * 提币ID
+	 */
+	private Long withdrawId;
 
 }

--
Gitblit v1.9.1