From 7ba7366a8c6ce8019339e433b218386645cb5312 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 17:38:53 +0800
Subject: [PATCH] Merge branch 'piot' of https://gitee.com/chonggaoxiao/new_excoin_manage into piot

---
 src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
index 8fc79fd..d36e620 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
@@ -1,8 +1,11 @@
 package com.xcong.excoin.modules.member.entity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xcong.excoin.common.entity.BaseEntity;
 
 import lombok.Data;
@@ -11,6 +14,10 @@
 @TableName("member_account_money_change")
 public class MemberAccountMoneyChangeEntity extends BaseEntity {
 private static final long serialVersionUID = 1L;
+
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date createTime; 
 	
 	/**
      *  类型【1:币币资产2:合约资产3:代理资产】
@@ -48,5 +55,47 @@
 	 * 状态【0:待审核 1:成功2:失败】
 	 */
 	private int status;
+	
+	/**
+     * 手机号(包含国际手机号)
+     */
+	@TableField(exist = false)
+    private String phone;
 
+    /**
+     * 邮箱
+     */
+	@TableField(exist = false)
+    private String email;
+	
+	@TableField(exist = false)
+	private String account;
+	/**
+     * 邀请码
+     */
+	@TableField(exist = false)
+    private String inviteId;
+	
+	/**
+	 * 总返佣
+	 */
+	@TableField(exist = false)
+	private String allAmount;
+	/**
+	 * 姓名
+	 */
+	@TableField(exist = false)
+	private String  realName;
+	
+	/**
+	 * 查询条件:账号类型
+	 */
+	@TableField(exist = false)
+    private String isTest;
+	
+	/**
+     * 账号类型 1-正常账号 2-测试账号
+     */
+	@TableField(exist = false)
+    private Integer accountType;
 }

--
Gitblit v1.9.1