From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:06:54 +0800
Subject: [PATCH] 系统合并
---
cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 75 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index bf3c6c6..598a08c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -1,44 +1,65 @@
package com.ruoyi.device.pojo;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.deepoove.poi.data.PictureRenderData;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
- * 璁惧缁存姢淇濆吇
+ * 璁惧缁存姢娣诲姞缁存姢璁板綍琛�
+ *
+ * @author makejava
+ * @since 2025-04-17 11:28:56
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@TableName("device_maintenance")
public class DeviceMaintenance {
- //璁惧id
@TableId(type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty("璁惧id")
private Integer deviceId;
- private String deviceName;
- //缂栧彿
- private String deviceNumber;
- //缁熶竴缂栧彿
- private String managementNumber;
- //缁存姢鍐呭
- private String content;
- //缁存姢鏃ユ湡
+ @ApiModelProperty("缁存姢鏃ユ湡")
+ private LocalDate maintenanceDate;
+
+ @ApiModelProperty("缁存姢鍐呭")
+ private String maintenanceContent;
+
+ @ApiModelProperty("缁存姢浜篿d")
+ private Integer maintenanceUserId;
+
+ @ApiModelProperty("缁存姢浜�")
+ private String maintenanceUserName;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate date;
- //涓嬫缁存姢鏃ユ湡
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate nextDate;
- //缁存姢绫诲瀷
- private Integer maintenanceType;
- //缁存姢浜哄憳
- private String name;
- //澶囨敞
- private String comments;
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鍒涘缓浜篿d")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鏇存柊浜篿d")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(select = false, exist = false)
+ @ApiModelProperty("缁存姢浜哄浘鐗�")
+ private PictureRenderData maintenanceUserUrlRender;
+
+
}
+
--
Gitblit v1.9.3