From a241055c2dc4ffd0b46a5e50b5c3b4666fc27cf1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 03 Nov 2022 10:33:24 +0800
Subject: [PATCH] Merge branch 'IGT-dev' of http://120.27.238.55:7000/r/sys-dapp into IGT-dev
---
src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java b/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java
index d355403..4c1883f 100644
--- a/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java
+++ b/src/main/java/cc/mrbird/febs/common/entity/BaseEntity.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -19,15 +20,21 @@
@TableId(value = "id",type = IdType.AUTO)
private Long id;
- private String createBy;
+ private String createBy = "system";
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createTime;
+ private Date createTime = new Date();
- private String updateBy;
+ private String updateBy = "system";
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
+ private Date updateTime = new Date();;
- private Integer version;
+ private Integer version = 1;
+
+ @TableField(exist = false)
+ private Long currentUser;
+//
+// @TableField(exist = false)
+// private String adminUserInvitedId;
}
--
Gitblit v1.9.1