From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExcel.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 6ed9903..3cb38a2 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
@@ -104,6 +104,12 @@
@ExcelProperty("关联派出所id")
private Long policeStationId;
/**
+ * 关联设备ID，逗号分隔
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("关联设备ID，逗号分隔")
+ private String deviceIds;
+ /**
* 可飞行日期时间-开始
*/
@ColumnWidth(20)
--
Gitblit v1.9.3