From 0d217eeff1f9d23844a54e8dd2ffebd8b4c2c1c7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 16:20:30 +0800
Subject: [PATCH] feat(production): 迁移生产管控

---
 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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..b4ad567 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,9 +3,11 @@
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -16,7 +18,10 @@
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
+
+    @ApiModelProperty("鎶ヤ慨閲戦")
+    private BigDecimal repairPrice;
 
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
@@ -26,6 +31,8 @@
 
     @ApiModelProperty("鎶ヤ慨鏃堕棿")
     private Date repairTime;
+    
+    private String repairTimeStr;
 
     @ApiModelProperty("鎶ヤ慨浜�")
     private String repairName;
@@ -38,6 +45,8 @@
 
     @ApiModelProperty("缁翠慨鏃堕棿")
     private Date maintenanceTime;
+
+    private String maintenanceTimeStr;
 
     @ApiModelProperty("缁翠慨缁撴灉")
     private String maintenanceResult;
@@ -64,7 +73,7 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
-
-
+    @ApiModelProperty("缁翠慨浠锋牸")
+    private String maintenancePrice;
 }
 

--
Gitblit v1.9.3