From 7b53707f0a9a195d56f8010e5b377eacba55609b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 19 三月 2026 10:23:00 +0800
Subject: [PATCH] Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index c101bc0..a63ff86 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,11 +3,13 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
@Data
public class DeviceRepairDto {
@@ -26,6 +28,8 @@
@ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
+
+ private String repairTimeStr;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
@@ -38,6 +42,8 @@
@ApiModelProperty("缁翠慨鏃堕棿")
private Date maintenanceTime;
+
+ private String maintenanceTimeStr;
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
@@ -65,6 +71,12 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
+
+ private String sparePartsNames;
+
+ private List<CommonFile> fileList;
}
--
Gitblit v1.9.3