From 7944fe0c62ad8ac73bfc46b44bdc243c78158abb Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 17:38:27 +0800
Subject: [PATCH] 销售订单数据排除反审

---
 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java |   17 ++++++++++++++++-
 1 files changed, 16 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..4ce9600 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,9 +26,22 @@
 
     @ApiModelProperty("鎶ヤ慨鏃堕棿")
     private Date repairTime;
+    
+    private String repairTimeStr;
 
     @ApiModelProperty("鎶ヤ慨浜�")
     private String repairName;
+
+    @ApiModelProperty("楠屾敹浜�")
+    private String acceptanceName;
+
+    @ApiModelProperty("楠屾敹鏃堕棿")
+    private Date acceptanceTime;
+
+    private String acceptanceTimeStr;
+
+    @ApiModelProperty("楠屾敹澶囨敞")
+    private String acceptanceRemark;
 
     @ApiModelProperty("鎶ヤ慨鍐呭")
     private String remark;
@@ -39,6 +52,8 @@
     @ApiModelProperty("缁翠慨鏃堕棿")
     private Date maintenanceTime;
 
+    private String maintenanceTimeStr;
+
     @ApiModelProperty("缁翠慨缁撴灉")
     private String maintenanceResult;
 

--
Gitblit v1.9.3