From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java | 14 ++++++++++++++
1 files changed, 14 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..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
@@ -151,4 +151,18 @@
@ApiModelProperty(value = "区域编码")
private String areaCode;
+ /**
+ * 设备类型（察打一体/便捷侦测箱/反制枪）
+ */
+ @TableField("device_type")
+ @ApiModelProperty(value = "设备类型（察打一体/便捷侦测箱/反制枪）")
+ private String deviceType;
+
+ /**
+ * 区域名称
+ */
+ @TableField("area_name")
+ @ApiModelProperty(value = "区域名称")
+ private String areaName;
+
}
--
Gitblit v1.9.3