From 0c022a90326d9e7afbfd816c789f7bd3ac848e06 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 08 一月 2026 15:58:20 +0800
Subject: [PATCH] 修改添加发货信息接口

---
 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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..ef745c2 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,6 +3,7 @@
 
 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;
 
@@ -16,7 +17,7 @@
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
 
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
@@ -26,6 +27,8 @@
 
     @ApiModelProperty("鎶ヤ慨鏃堕棿")
     private Date repairTime;
+    
+    private String repairTimeStr;
 
     @ApiModelProperty("鎶ヤ慨浜�")
     private String repairName;
@@ -39,10 +42,12 @@
     @ApiModelProperty("缁翠慨鏃堕棿")
     private Date maintenanceTime;
 
+    private String maintenanceTimeStr;
+
     @ApiModelProperty("缁翠慨缁撴灉")
     private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵��")
+    @ApiModelProperty("鐘舵��:0瀹℃牳涓�,1瀹℃牳閫氳繃,2瀹℃牳澶辫触,3缁翠慨涓�,4缁翠慨閫氳繃,5缁翠慨澶辫触")
     private Integer status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
@@ -64,7 +69,7 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
-
-
+    @ApiModelProperty("缁翠慨浠锋牸")
+    private String maintenancePrice;
 }
 

--
Gitblit v1.9.3