From 7a393cea127859281a4edd08d6f75630a8d429a5 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期二, 26 九月 2023 16:32:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java
index eb7fb15..3a7b359 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java
@@ -25,8 +25,8 @@
//IC卡编号
private String icNum;
//作业时间
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date violationTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date workTime;
//所属单位
private String dept;
//操作类型id
--
Gitblit v1.9.2