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/dto/FwAreaDivideDTO.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 38c593b..793240d 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
@@ -121,6 +121,14 @@
 	 */
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
+	/**
+	 * 区域类型key集合（逗号分隔）
+	 */
+	@ApiModelProperty(value = "区域类型key集合（逗号分隔）")
+	private String areaTypeKeys;
+
+	@ApiModelProperty(value = "区域类型key集合", hidden = true)
+	private List<String> areaTypeKeyList;
 
 	@ApiModelProperty(value = "部门集合",hidden = true)
 	private List<Long> deptList;

--
Gitblit v1.9.3