From 31eda012c6f3388f1c7441951a250b54c046e7ea Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 09 Jan 2026 17:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java
index 13fe026..35537ef 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/dto/FwEffectEvalDTO.java
@@ -43,6 +43,13 @@
 	 */
 	@ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）")
 	private Long alarmRecordId;
+
+	/**
+	 * 反制方式：信号干扰/诱导驱离/无
+	 */
+	@ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
+	private String counterWay;
+
 	/**
 	 * 反制设备ID（ja_fw_device.id）
 	 */

--
Gitblit v1.9.3