From 40393ae605bb5df6d4ffa136e13fd952bd936b29 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Sep 2021 17:21:58 +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 |   19 +++++++++++++++++--
 1 files changed, 17 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..41188de 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;
@@ -36,11 +37,25 @@
      * 账户状态;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;
 

--
Gitblit v1.9.1