From bbdf915fd1cb54876b38be325b67a61c0d50cbbe Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sun, 18 Dec 2022 12:45:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=9C=AA=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes https://gitee.com/youlaiorg/youlai-boot/issues/I66H7O --- .../youlai/system/pojo/entity/SysDept.java | 15 +++--------- .../system/pojo/entity/SysDictItem.java | 13 +++-------- .../system/pojo/entity/SysDictType.java | 22 +++++------------- .../youlai/system/pojo/entity/SysMenu.java | 2 +- .../youlai/system/pojo/entity/SysRole.java | 20 ++-------------- .../system/pojo/entity/SysRoleMenu.java | 8 +++---- .../youlai/system/pojo/entity/SysUser.java | 23 +++---------------- .../system/pojo/entity/SysUserRole.java | 11 +++++---- 8 files changed, 27 insertions(+), 87 deletions(-) diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDept.java b/src/main/java/com/youlai/system/pojo/entity/SysDept.java index dc84e607..a54e8227 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDept.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysDept.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; + +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** @@ -14,7 +14,7 @@ import lombok.Data; */ @TableName(value ="sys_dept") @Data -public class SysDept implements Serializable { +public class SysDept extends BaseEntity { /** * 主键 */ @@ -51,15 +51,6 @@ public class SysDept implements Serializable { */ private Integer deleted; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java b/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java index 96f8d346..6e5bb20d 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java @@ -10,7 +10,9 @@ import lombok.Data; /** * 字典数据表 - * @TableName sys_dict_item + * + * @author haoxr + * @date 2022/12/17 */ @TableName(value ="sys_dict_item") @Data @@ -56,15 +58,6 @@ public class SysDictItem implements Serializable { */ private String remark; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java b/src/main/java/com/youlai/system/pojo/entity/SysDictType.java index 2ee71d91..5f582183 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysDictType.java @@ -6,15 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** * 字典类型表 - * @TableName sys_dict_type + * + * @author haoxr + * @date 2022/12/17 */ -@TableName(value ="sys_dict_type") @Data -public class SysDictType implements Serializable { +public class SysDictType extends BaseEntity { /** * 主键 */ @@ -40,17 +43,4 @@ public class SysDictType implements Serializable { * 备注 */ private String remark; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java b/src/main/java/com/youlai/system/pojo/entity/SysMenu.java index 0b63e9c3..3b49ab86 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysMenu.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.system.common.base.BaseEntity; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.system.common.enums.MenuTypeEnum; import lombok.Data; /** diff --git a/src/main/java/com/youlai/system/pojo/entity/SysRole.java b/src/main/java/com/youlai/system/pojo/entity/SysRole.java index 6fce20fa..3ba3a56c 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysRole.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysRole.java @@ -1,20 +1,17 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** * 角色表 - * @TableName sys_role */ @TableName(value ="sys_role") @Data -public class SysRole implements Serializable { +public class SysRole extends BaseEntity { /** * */ @@ -46,19 +43,6 @@ public class SysRole implements Serializable { */ private Integer deleted; - /** - * 更新时间 - */ - private Date createTime; - - /** - * 创建时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - /** * 数据权限 */ diff --git a/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java b/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java index 991a6178..3b664948 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java @@ -1,20 +1,18 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; -import java.io.Serializable; /** * 角色和菜单关联表 - * @TableName sys_role_menu */ -@TableName(value ="sys_role_menu") @Data @AllArgsConstructor -public class SysRoleMenu implements Serializable { +@NoArgsConstructor +public class SysRoleMenu { /** * 角色ID */ diff --git a/src/main/java/com/youlai/system/pojo/entity/SysUser.java b/src/main/java/com/youlai/system/pojo/entity/SysUser.java index cab05f1b..ab801441 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysUser.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysUser.java @@ -1,20 +1,15 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** - * 用户信息表 - * @TableName sys_user + * 用户表 */ -@TableName(value ="sys_user") @Data -public class SysUser implements Serializable { +public class SysUser extends BaseEntity { /** * */ @@ -71,16 +66,4 @@ public class SysUser implements Serializable { */ private Integer deleted; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java b/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java index b8ebcbeb..ff6def85 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java @@ -1,20 +1,21 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; -import java.io.Serializable; /** * 用户和角色关联表 - * @TableName sys_user_role + * + * @author haoxr + * @date 2022/12/17 */ -@TableName(value ="sys_user_role") @Data @AllArgsConstructor -public class SysUserRole implements Serializable { +@NoArgsConstructor +public class SysUserRole { /** * 用户ID */