From 0570e8de9ba479d67dfcfdeebe1cfccc4a56f812 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 11:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideStatisticsVO.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideStatisticsVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideStatisticsVO.java
index cd6c576..0c090b2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideStatisticsVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideStatisticsVO.java
@@ -47,10 +47,10 @@
 	private String areaName;
 
 	/**
-	 * 区域类型
+	 * 区域类型key集合（逗号分隔）
 	 */
-	@ApiModelProperty(value = "区域类型")
-	private String areaType;
+	@ApiModelProperty(value = "区域类型key集合（逗号分隔）")
+	private String areaTypeKeys;
 
 	/**
 	 * 场景名称

--
Gitblit v1.9.3