From bb78ea38792502cbff36c9a4486b7b12e1940615 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 10:59:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
index 694b1d6..9d16e4d 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java
@@ -37,7 +37,7 @@
 
     @ApiModelProperty("缁翠慨鏃堕棿")
     @Excel(name = "缁翠慨鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date maintenanceTime;
+    private LocalDateTime maintenanceTime;
 
     @ApiModelProperty("缁翠慨缁撴灉")
     @Excel(name = "缁翠慨缁撴灉")

--
Gitblit v1.9.3