From 1402b12c5238a979364eac9d30ed1f25fbc14a49 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期日, 04 一月 2026 19:15:48 +0800
Subject: [PATCH] Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index c101bc0..92cfe8c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -26,6 +26,8 @@
@ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
+
+ private String repairTimeStr;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
@@ -39,6 +41,8 @@
@ApiModelProperty("缁翠慨鏃堕棿")
private Date maintenanceTime;
+ private String maintenanceTimeStr;
+
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
--
Gitblit v1.9.3