From 3450525681e6e290d80ee5d27d0aaca395b62c8f Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 01 二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java
index 8bffe22..b116662 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.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;
@@ -32,7 +33,7 @@
//IC卡编号
private String icNum;
//作业时间
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date workTime;
//所属单位
private String dept;
@@ -50,12 +51,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