From 2736d16a8b1804f7291a56a147f76ef3584d6619 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 04 Jul 2022 19:35:31 +0800 Subject: [PATCH] fix 上传模板和查看栏目修改 --- src/main/java/com/xcong/farmer/cms/modules/system/entity/UserEntity.java | 19 +++++++++++++++---- 1 files changed, 15 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 638af70..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; @@ -11,9 +13,17 @@ @TableName("t_user") public class UserEntity extends BaseEntity { /** + * 默认账户 + */ + public static final String USERNAME_DEFAULT = "system"; + /** * 默认密码 */ public static final String PASSWORD_DEFAULT = "123456"; + /** + * 系统最高账户的所属默认 + */ + public static final Long USER_BELONG_TOP = 0L; /** * 账号状态 - 禁用 */ @@ -28,10 +38,6 @@ private String nickname; //登录密码 private String password; - //角色ID - private Long roleId; - //角色名称 - private String roleName; //联系电话 private String phone; //邮箱 @@ -40,4 +46,9 @@ private Integer status; //拓展备注 private String remark; + //所属ID + private Long companyId; + + @TableField(exist = false) + private String roleName; } -- Gitblit v1.9.1