From eb33eb189ea57849c766094105d9c7f4f939e217 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Sep 2021 15:08:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/entity/MallMember.java |   61 +++++++++++++++++++++++++++++-
 1 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index 4766a06..e753d5f 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -2,6 +2,7 @@
 
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.BaseEntity;
+import cc.mrbird.febs.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -14,34 +15,90 @@
 @TableName("mall_member")
 public class MallMember extends BaseEntity {
 
+    /**
+     * 姓名
+     */
     private String name;
 
+    /**
+     * 手机号
+     */
     private String phone;
 
+    /**
+     * 邮箱
+     */
     private String email;
 
+    /**
+     * 密码
+     */
     private String password;
 
+    /**
+     * 资金密码
+     */
+    private String tradePassword;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 性别
+     */
     private String sex;
 
+    /**
+     * 邀请码
+     */
     private String inviteId;
 
+    /**
+     * 父级邀请码
+     */
     private String referrerId;
 
+    /**
+     * 邀请码链
+     */
     private String referrerIds;
 
+    /**
+     * 代理级别
+     */
     private String level;
 
     /**
      * 账户状态;1-正常 2-禁用
      */
     private Integer accountStatus;
-    public static final int ACCOUNTSTATUS_Y = 1;
-    public static final int ACCOUNTSTATUS_N = 2;
+    /**
+     * 启用
+     */
+    public static final Integer ACCOUNT_STATUS_ENABLE = 1;
+    /**
+     * 禁用
+     */
+    public static final Integer ACCOUNT_STATUS_DISABLED = 2;
 
+    /**
+     * 账号类型
+     */
     private Integer accountType;
 
+    /**
+     * 正常账号
+     */
+    public static final Integer ACCOUNT_TYPE_NORMAL = 1;
+    /**
+     * 测试账号
+     */
+    public static final Integer ACCOUNT_TYPE_TEST = 2;
     @TableField(exist = false)
     private String account;
 
+    private String bindPhone;
+
 }

--
Gitblit v1.9.1