From c1babcfa8a9cd01dbeb8527a6a95cbcc431957c7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 22 四月 2026 10:42:35 +0800
Subject: [PATCH] fix:生产模块
---
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 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..f4e71c5 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -2,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.device.pojo.DeviceMaintenance;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
-public class DeviceMaintenanceDto {
+public class DeviceMaintenanceDto extends DeviceMaintenance {
@ApiModelProperty("璁惧淇濆吇id")
@@ -24,47 +24,28 @@
@ApiModelProperty("瑙勬牸鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private String maintenancePlanTimeReq;
-
- @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private LocalDateTime maintenancePlanTime;
-
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
-
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private LocalDateTime maintenanceActuallyTime;
-
- @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private String maintenanceActuallyTimeReq;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
- @TableField(fill = FieldFill.INSERT)
- private String createUser;
-
@ApiModelProperty("鏇存柊浜�")
- @TableField(fill = FieldFill.UPDATE)
- private String updateUser;
+ private String updateUserName;
@ApiModelProperty("绉熸埛id")
- @TableField(fill = FieldFill.INSERT)
private Long tenantId;
@ApiModelProperty("鍒涘缓浜哄悕绉�")
private String createUserName;
}
+
--
Gitblit v1.9.3