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 | 9 ++-------
1 files changed, 2 insertions(+), 7 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 a595cf7..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
@@ -48,7 +48,7 @@
* 对应计划ID（空表示临时维护）
*/
@TableField("plan_id")
- @ApiModelProperty(value = "对应计划ID（空表示临时维护）")
+ @ApiModelProperty(value = "对应计划ID")
private Long planId;
/**
* 实际维护时间
@@ -68,12 +68,7 @@
@TableField("replace_part")
@ApiModelProperty(value = "更换部件")
private String replacePart;
- /**
- * 维护结果（已维护/已保养/故障未修复等）
- */
- @TableField("maintain_result")
- @ApiModelProperty(value = "维护结果（已维护/已保养/故障未修复等）")
- private String maintainResult;
+
/**
* 备注
*/
--
Gitblit v1.9.3