From b1f7d9f1c9a23c2e360d93d1ee60e03cc94a78d2 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 12 Jan 2026 11:08:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java
index 2c5fa90..6ed9903 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java
@@ -22,12 +22,11 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;
-import org.sxkj.fw.utils.excel.LocalTimeConverter;
+import org.sxkj.fw.utils.excel.LocalDateTimeConverter;
import java.io.Serializable;
import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.LocalDateTime;
/**
@@ -105,29 +104,17 @@
@ExcelProperty("关联派出所id")
private Long policeStationId;
/**
- * 可飞行时间段-开始
+ * 可飞行日期时间-开始
*/
@ColumnWidth(20)
- @ExcelProperty(value = "可飞行时间段-开始", converter = LocalTimeConverter.class)
- private LocalTime flyTimeStart;
+ @ExcelProperty(value = "可飞行日期时间-开始", converter = LocalDateTimeConverter.class)
+ private LocalDateTime flyDateStart;
/**
- * 可飞行时间段-结束
+ * 可飞行日期时间-结束
*/
@ColumnWidth(20)
- @ExcelProperty(value = "可飞行时间段-结束", converter = LocalTimeConverter.class)
- private LocalTime flyTimeEnd;
- /**
- * 可飞行日期-开始
- */
- @ColumnWidth(20)
- @ExcelProperty("可飞行日期-开始")
- private LocalDate flyDateStart;
- /**
- * 可飞行日期-结束
- */
- @ColumnWidth(20)
- @ExcelProperty("可飞行日期-结束")
- private LocalDate flyDateEnd;
+ @ExcelProperty(value = "可飞行日期时间-结束", converter = LocalDateTimeConverter.class)
+ private LocalDateTime flyDateEnd;
/**
* 区域编码
*/
--
Gitblit v1.9.3