From ae195b1a4d78991075e8225fd3824b60166c1a8c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 17:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
index f8fdf7a..2587640 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideDTO.java
@@ -64,7 +64,7 @@
 	 * 经纬度面（存储地理面数据）
 	 */
 	@ApiModelProperty(value = "经纬度面（存储地理面数据）")
-	private byte[] geom;
+	private String geom;
 	/**
 	 * 区域类型：报警区/重点管制区
 	 */

--
Gitblit v1.9.3