From 4eeb403ab81c2cd88e2f8004913afff64f0142e3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 27 二月 2026 17:46:01 +0800
Subject: [PATCH] 设备保养-任务记录增加备注字段； 供应商档案增加供应商类型字段，由字典维护；
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 10 ++++++----
1 files changed, 6 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 de440ca..0a0a977 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -6,7 +6,6 @@
import lombok.Data;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
public class DeviceMaintenanceDto {
@@ -28,13 +27,13 @@
private String maintenancePlanTimeReq;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private LocalDateTime maintenancePlanTime;
+ private String maintenancePlanTime;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private LocalDateTime maintenanceActuallyTime;
+ private String maintenanceActuallyTime;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
private String maintenanceActuallyTimeReq;
@@ -42,7 +41,7 @@
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -67,4 +66,7 @@
@ApiModelProperty("鍒涘缓浜哄悕绉�")
private String createUserName;
+
+ @ApiModelProperty("澶囨敞")
+ private String Remark;
}
--
Gitblit v1.9.3