From dbc7e62be76ff48b26461ffaef9c3fc87be018cb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 11 Feb 2026 11:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
index ef53ca4..c352cac 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
@@ -159,4 +159,10 @@
 	// 当前用户部门ID
 	@ApiModelProperty(value = "当前用户部门ID",hidden = true)
 	private String currentDeptId;
+
+	@ApiModelProperty(value = "regionName",hidden = true)
+	private String regionName;
+
+	@ApiModelProperty(value = "regionCode",hidden = true)
+	private String regionCode;
 }

--
Gitblit v1.9.3