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/dto/FwAreaDivideStatisticsDTO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java
index 31b26fa..009adbe 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/dto/FwAreaDivideStatisticsDTO.java
@@ -55,6 +55,12 @@
 	private String areaType;
 
 	/**
+	 * 区域类型key集合（逗号分隔）
+	 */
+	@ApiModelProperty(value = "区域类型key集合（逗号分隔）")
+	private String areaTypeKeys;
+
+	/**
 	 * 场景类型
 	 */
 	@ApiModelProperty(value = "场景类型")
@@ -108,4 +114,7 @@
 
 	@ApiModelProperty(value = "部门集合",hidden = true)
 	private List<Long> deptList;
+
+	@ApiModelProperty(value = "区域类型key集合", hidden = true)
+	private List<String> areaTypeKeyList;
 }

--
Gitblit v1.9.3