From 211aafe0cb765b1deb5f2ef54949d64e9b0de8c3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 03 十二月 2025 17:56:36 +0800
Subject: [PATCH] yys1.海川开心-修改首页库存与采购数据不显示问题    2.海川开心-优化选择审批人时增加模糊查询    3.海川开心-协同办公部门改为可手动输入    4.海川开心-修改回款流水导出没数据问题

---
 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 8df1411..92cfe8c 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -16,7 +16,7 @@
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
 
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
@@ -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