From 1614615fc9319b8626eb028598b894311992c033 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: Mon, 25 Sep 2023 15:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/TrainingInstitution.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/TrainingInstitution.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/TrainingInstitution.java
index ad62bbe..7e1d178 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/TrainingInstitution.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/TrainingInstitution.java
@@ -1,5 +1,6 @@
package com.gkhy.exam.noncoalmine.entity;
+import java.time.LocalDateTime;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -49,10 +50,10 @@
private String updateBy;
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private LocalDateTime createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ private LocalDateTime updateTime;
}
--
Gitblit v1.9.2