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/model/addForm/WorkRegistrationAddForm.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java
index c621c64..648cc3d 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java
@@ -31,7 +31,7 @@
 	//作业时间
 	@NotNull(message = "请填写做业时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date violationTime;
+	private Date workTime;
 	//所属单位
 	@NotEmpty(message = "请填写所属单位")
 	private String dept;

--
Gitblit v1.9.2