From 00e6f6d3dac8c0140ca276ddeb99d825831ce5a3 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 17:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java
index 3b5f937..1515536 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/excel/FwDroneFlightRecordExcel.java
@@ -54,21 +54,21 @@
@ExcelProperty("序列号")
private String serialNo;
- @ColumnWidth(20)
- @ExcelProperty("首次告警时间")
- private Date alarmTime;
-
- @ColumnWidth(20)
- @ExcelProperty("触发原因")
- private String triggerType;
+ // @ColumnWidth(20)
+ // @ExcelProperty("首次告警时间")
+ // private Date alarmTime;
+ //
+ // @ColumnWidth(20)
+ // @ExcelProperty("触发原因")
+ // private String triggerType;
@ColumnWidth(20)
@ExcelProperty("停留时长")
private String stayDuration;
- @ColumnWidth(20)
- @ExcelProperty("区域名称")
- private String areaName;
+ // @ColumnWidth(20)
+ // @ExcelProperty("区域名称")
+ // private String areaName;
@ColumnWidth(20)
@ExcelProperty("经度")
--
Gitblit v1.9.3