From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainRecordEntity.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainRecordEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainRecordEntity.java
index 291f7e7..09b1102 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainRecordEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainRecordEntity.java
@@ -17,18 +17,20 @@
package org.sxkj.fw.device.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
/**
* 设备维护记录表 实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
@TableName("ja_fw_device_maintain_record")
@@ -36,5 +38,48 @@
@EqualsAndHashCode(callSuper = true)
public class FwDeviceMaintainRecordEntity extends BaseEntity {
+ /**
+ * 设备ID
+ */
+ @TableField("device_id")
+ @ApiModelProperty(value = "设备ID")
+ private Long deviceId;
+ /**
+ * 对应计划ID（空表示临时维护）
+ */
+ @TableField("plan_id")
+ @ApiModelProperty(value = "对应计划ID")
+ private Long planId;
+ /**
+ * 实际维护时间
+ */
+ @TableField("maintain_time")
+ @ApiModelProperty(value = "实际维护时间")
+ private Date maintainTime;
+ /**
+ * 维护内容
+ */
+ @TableField("maintain_content")
+ @ApiModelProperty(value = "维护内容")
+ private String maintainContent;
+ /**
+ * 更换部件
+ */
+ @TableField("replace_part")
+ @ApiModelProperty(value = "更换部件")
+ private String replacePart;
+
+ /**
+ * 备注
+ */
+ @TableField("remark")
+ @ApiModelProperty(value = "备注")
+ private String remark;
+ /**
+ * 区域编码
+ */
+ @TableField("area_code")
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
}
--
Gitblit v1.9.3