From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng
---
src/main/java/com/xcong/farmer/cms/common/system/base/BaseEntity.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/common/system/base/BaseEntity.java b/src/main/java/com/xcong/farmer/cms/common/system/base/BaseEntity.java
index 970c4d5..88fdd32 100644
--- a/src/main/java/com/xcong/farmer/cms/common/system/base/BaseEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/common/system/base/BaseEntity.java
@@ -21,13 +21,15 @@
@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 = 1;
}
--
Gitblit v1.9.1