From 46b35a8bbb4767b2a28b03a88f705d18c9dbf426 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 14 Jan 2026 15:02:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java |    6 ++++++
 1 files changed, 6 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 218449c..b4ca89b 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
@@ -164,5 +164,11 @@
 	@TableField("area_name")
 	@ApiModelProperty(value = "区域名称")
 	private String areaName;
+	/**
+	 *  设备编号
+	 */
+	@TableField("device_sn")
+	@ApiModelProperty(value = "设备编号")
+	private String deviceSn;
 
 }

--
Gitblit v1.9.3