From 7488018d52edaafcd4e541c5fdeada8dd2e47b11 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 22 十二月 2025 16:49:18 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into jtwy

---
 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