From 0100359605ba05638c1f683d68a2948cc273b0d2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 08 十二月 2025 11:21:29 +0800
Subject: [PATCH] yys  修改设备模块

---
 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 92dd71a..8bf980a 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -4,6 +4,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -17,11 +18,16 @@
     @Excel(name = "璁惧鍚嶇О")
     private String deviceName;
 
+
+    @ApiModelProperty("璁惧淇濆吇閲戦")
+    @Excel(name = "璁惧淇濆吇閲戦")
+    private BigDecimal maintenancePrice;
+
     @Excel(name = "瑙勬牸鍨嬪彿")
     @ApiModelProperty("瑙勬牸鍨嬪彿")
     private String deviceModel;
 
-    @Excel(name = "璁″垝淇濆吇鏃ユ湡")
+    @Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
     private Date maintenancePlanTime;
 
@@ -30,7 +36,7 @@
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    @Excel(name = "瀹為檯淇濆吇鏃ユ湡")
+    @Excel(name = "瀹為檯淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     private LocalDateTime maintenanceActuallyTime;
 
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
@@ -42,11 +48,11 @@
     private String status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
-    @Excel(name = "褰曞叆鏃堕棿")
+    @Excel(name = "褰曞叆鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     private Date createTime;
 
     @ApiModelProperty("鍒涘缓浜�")
-    @Excel(name = "褰曞叆浜�")
+//    @Excel(name = "褰曞叆浜�")
     private String createUser;
 
 }

--
Gitblit v1.9.3