From fbb48357d807b6e776821decacda68af6b2cc6aa Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 14:02:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceMaintainPlanExcel.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceMaintainPlanExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceMaintainPlanExcel.java
index 317a02a..3393c2d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceMaintainPlanExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/excel/FwDeviceMaintainPlanExcel.java
@@ -17,21 +17,20 @@
package org.sxkj.fw.device.excel;
+import lombok.Data;
+
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import lombok.Data;
-
import java.io.Serializable;
-import java.time.LocalDate;
/**
* 设备维护计划表 Excel实体类
*
- * @author lw
- * @since 2026-01-08
+ * @author Aix
+ * @since 2026-01-09
*/
@Data
@ColumnWidth(25)
@@ -48,17 +47,17 @@
@ExcelProperty("设备ID")
private Long deviceId;
/**
- * 计划周期（每月1日/每季1日等）
+ * 计划周期（每年、每月、每周）
*/
@ColumnWidth(20)
- @ExcelProperty("计划周期（每月1日/每季1日等）")
- private String planCycle;
+ @ExcelProperty("计划周期（每年、每月、每周）")
+ private String planCycleType;
/**
- * 计划日期（YYYY-MM-DD）
+ * 计划周期具体值，数组对象[1,2,3]
*/
@ColumnWidth(20)
- @ExcelProperty("计划日期（YYYY-MM-DD）")
- private LocalDate planTime;
+ @ExcelProperty("计划周期具体值，数组对象[1,2,3]")
+ private String planCycleValue;
/**
* 区域编码
*/
--
Gitblit v1.9.3