From 395f924baaf24f421eb378f3730b28acaefd027c Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 14 九月 2023 16:01:22 +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 | 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 cc9c6cb..8bffe22 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 @@
private String icNum;
//作业时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date violationTime;
+ private Date workTime;
//所属单位
private String dept;
//操作类型id
--
Gitblit v1.9.2