From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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..905e012 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,13 @@
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
/**
* 角色表 sys_role
@@ -17,14 +16,14 @@
*/
@Data
@TableName("sys_role")
-public class SysRoleDO
-{
+public class SysRoleDO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 角色id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
/**
@@ -60,27 +59,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 +93,6 @@
*/
private Long communityId;
-
-
+ private String areaCode;
}
--
Gitblit v1.7.1