From 312dc55b139d16a73e58cd6899865e11e86c6fdc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 19:46:15 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java
index 0b3958b..6c43a8e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java
@@ -1,6 +1,8 @@
package com.xcong.farmer.cms.modules.system.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.type.Date;
import com.xcong.farmer.cms.common.system.base.BaseEntity;
import lombok.Data;
@@ -19,6 +21,10 @@
*/
public static final String PASSWORD_DEFAULT = "123456";
/**
+ * 系统最高账户的所属默认
+ */
+ public static final Long USER_BELONG_TOP = 0L;
+ /**
* 账号状态 - 禁用
*/
public static final Integer STATUS_DISABLED = 0;
@@ -32,10 +38,6 @@
private String nickname;
//登录密码
private String password;
- //角色ID
- private Long roleId;
- //角色名称
- private String roleName;
//联系电话
private String phone;
//邮箱
@@ -44,4 +46,9 @@
private Integer status;
//拓展备注
private String remark;
+ //所属ID
+ private Long companyId;
+
+ @TableField(exist = false)
+ private String roleName;
}
--
Gitblit v1.9.1