From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
index 4335830..89cf90c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
@@ -57,9 +57,9 @@
 	/**
 	 * 反制设备编码(快照)
 	 */
-	@TableField("device_code")
+	@TableField("device_sn")
 	@ApiModelProperty(value = "反制设备编码(快照)")
-	private String deviceCode;
+	private String deviceSn;
 	/**
 	 * 反制设备名称(快照)
 	 */

--
Gitblit v1.9.3