From f799d1ec5a439003baf2ec6d7a5919718cfdcc14 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 17 Jan 2026 17:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
index d94d77d..f4fbb3f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
@@ -118,6 +118,12 @@
 	@ApiModelProperty("入库时间")
 	private Date createTime;
 
+	@ApiModelProperty(value = "维修状态")
+	private String maintainStatus;
+
+	@ApiModelProperty(value = "最后维修时间")
+	private String lastMaintainTime;
+
 	@ApiModelProperty(value = "所属部门名称")
 	public String getBelongDeptName() {
 		if (belongDept == null) {

--
Gitblit v1.9.3