From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java
index f7325dc..4f91587 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/ReportAfterRepair.java
@@ -56,7 +56,7 @@
@Excel(name = "鏁呴殰鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date faultTime;
+ private java.util.Date faultTime;
/**鏄惁鍋滄満寰呬慨*/
@Excel(name = "鏄惁鍋滄満寰呬慨", width = 15)
@ApiModelProperty(value = "鏄惁鍋滄満寰呬慨")
--
Gitblit v1.9.3