From b7eab0dfd01f691efa10980aebc872fa872cb8ea Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 30 七月 2025 14:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java
index 5bcc529..dccc948 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/EquipmentRepairListVO.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.eam.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecg.modules.mdc.util.DateUtils;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -31,6 +33,8 @@
/**
* 鏁呴殰寮�濮嬫椂闂�
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yy-MM-dd HH:mm")
private Date faultStartTime;
/**
* 缁翠慨浜�
@@ -39,6 +43,8 @@
/**
* 鎺ュ崟鏃堕棿
*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yy-MM-dd HH:mm")
private Date repairStartTime;
/**
* 鏁呴殰鎸佺画鏃堕暱(MIN)
--
Gitblit v1.9.3