From f04b8922283120e2bc4a476ddc302ebd3b0894e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 20:42:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 bd346e4..2fd39c8 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;
@@ -18,6 +20,10 @@
* 默认密码
*/
public static final String PASSWORD_DEFAULT = "123456";
+ /**
+ * 系统最高账户的所属默认
+ */
+ public static final Long USER_BELONG_TOP = 0L;
/**
* 账号状态 - 禁用
*/
@@ -41,5 +47,11 @@
//拓展备注
private String remark;
//所属ID
- private Long belongId;
+ private Long companyId;
+
+ @TableField(exist = false)
+ private String roleName;
+
+ @TableField(exist = false)
+ private Long roleId;
}
--
Gitblit v1.9.1