From 6e2ffa951a5a08366e001a6bdec958eba9abcf99 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 19 Jan 2026 15:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
index e521e73..15f4ce0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
@@ -19,12 +19,15 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 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.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -55,6 +58,19 @@
 	@ApiModelProperty(value = "计划周期具体值，数组对象[1,2,3]")
 	@TableField(typeHandler = FastjsonTypeHandler.class)
 	private List<String> planCycleValue;
+
+	@ApiModelProperty(value = "维护状态（0未维修1已维修）")
+	private Integer maintainStatus;
+
+	@ApiModelProperty(value = "最后维修时间")
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	private Date lastMaintainTime;
+
 	/**
 	 * 区域编码
 	 */

--
Gitblit v1.9.3