From 80ec5979c3688a01359517cda32bc33b20c7f66b Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Fri, 09 Jan 2026 10:48:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
index c200b05..218449c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
@@ -158,4 +158,11 @@
 	@ApiModelProperty(value = "设备类型(察打一体/便捷侦测箱/反制枪)")
 	private String deviceType;
 
+	/**
+	 * 区域名称
+	 */
+	@TableField("area_name")
+	@ApiModelProperty(value = "区域名称")
+	private String areaName;
+
 }

--
Gitblit v1.9.3