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/device/entity/FwDeviceEntity.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
index f9513c0..c3c3487 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
@@ -38,6 +38,12 @@
 public class FwDeviceEntity extends BaseEntity {
 
 	/**
+	 * 设备sn
+	 */
+	@ApiModelProperty(value = "设备sn")
+	private String deviceSn;
+
+	/**
 	 * 设备名称
 	 */
 	@ApiModelProperty(value = "设备名称")

--
Gitblit v1.9.3