From 9289aa181144778637d18a3f727663a10b5195cc Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期一, 24 六月 2024 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/master' into zf1
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java | 2 +-
1 files changed, 1 insertions(+), 1 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 57f47dd..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
@@ -33,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;
--
Gitblit v1.9.2