From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExtExcel.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExtExcel.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExtExcel.java
index 09cfd6f..83a0e02 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExtExcel.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwAreaDivideExtExcel.java
@@ -59,11 +59,11 @@
@ExcelProperty("区域类型数字字典value")
private String areaTypeValue;
/**
- * 面数据（空间类型，便于地理查询）
+ * 几何JSON
*/
@ColumnWidth(20)
- @ExcelProperty("面数据（空间类型，便于地理查询）")
- private byte[] geom;
+ @ExcelProperty("几何JSON")
+ private String geomJson;
/**
* 区域编码
*/
--
Gitblit v1.9.3