From d6578ec702eb4fcff690d71ea3237a885f46b85c Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期三, 06 七月 2022 15:37:49 +0800 Subject: [PATCH] Merge branch 'huacheng' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java index 7c60d9e..ff495c5 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java @@ -1,14 +1,11 @@ package com.panzhihua.service_user.model.dos; - -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 lombok.Data; - +import java.io.Serializable; import java.util.Date; +import com.baomidou.mybatisplus.annotation.*; + +import lombok.Data; /** * 角色表 sys_role @@ -17,8 +14,7 @@ */ @Data @TableName("sys_role") -public class SysRoleDO -{ +public class SysRoleDO implements Serializable { private static final long serialVersionUID = 1L; /** @@ -60,27 +56,29 @@ /** * 角色状态(0正常 1停用) */ - private String status; + private Integer status; /** * 创建者 */ - private String createBy; + private Long createBy; /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private Date createAt; /** * 更新者 */ - private String updateBy; + private Long updateBy; /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateAt; /** * 备注 @@ -92,7 +90,6 @@ */ private Long communityId; - - + private String areaCode; } -- Gitblit v1.7.1