From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +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 877d85d..c200b05 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
@@ -151,4 +151,11 @@
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
 
+	/**
+	 * 设备类型(察打一体/便捷侦测箱/反制枪)
+	 */
+	@TableField("device_type")
+	@ApiModelProperty(value = "设备类型(察打一体/便捷侦测箱/反制枪)")
+	private String deviceType;
+
 }

--
Gitblit v1.9.3