From 2749626492862339a50789933bb110f691426225 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 07 八月 2024 16:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java
index fd7c16f..05ababf 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -22,7 +23,7 @@
@ApiModelProperty(value = "记录创建时间，前端忽略")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "create_time", fill = FieldFill.INSERT)
- private Date createTime;
+ private LocalDateTime createTime;
/** 是否删除 0未删除 1已删除 */
@TableField("del_flag")
@@ -30,11 +31,11 @@
@TableLogic
private Boolean delFlag;
- public Date getCreateTime() {
+ public LocalDateTime getCreateTime() {
return createTime;
}
- public void setCreateTime(Date createTime) {
+ public void setCreateTime(LocalDateTime createTime) {
this.createTime = createTime;
}
--
Gitblit v1.7.1