From 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 17:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index 2714544..560af37 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -13,7 +13,6 @@
@ApiModelProperty("璁惧淇濆吇id")
-
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
@@ -26,6 +25,9 @@
private String deviceModel;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+ private String maintenancePlanTimeReq;
+
+ @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
private LocalDateTime maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
@@ -34,10 +36,13 @@
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
private LocalDateTime maintenanceActuallyTime;
- @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
- private Integer maintenanceResult;
+ @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+ private String maintenanceActuallyTimeReq;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+ private String maintenanceResult;
+
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
--
Gitblit v1.9.3