From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/coin/entity/MemberAccountMoneyChange.java | 20 +++++++++++++-------
1 files changed, 13 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..bdc07b5 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
@@ -3,9 +3,11 @@
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -27,8 +29,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 +39,7 @@
/**
* 金额
*/
- private BigDecimal price;
- /**
- * 时间
- */
- private Date time;
+ private BigDecimal amount;
/**
* 记录内容
*/
@@ -56,5 +52,15 @@
* 状态【0:待审核 1：成功2：失败】
*/
private int status;
+ /**
+ * 提币ID
+ */
+ private Long withdrawId;
+ /**
+ * 类型
+ * 1：充币，2：提币，3：划转，4：其他
+ */
+ @TableField(exist = false)
+ private int typeCoin;
}
--
Gitblit v1.9.1