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/dto/FwDeviceDTO.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
index 991ef8a..dfd332a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
@@ -42,7 +42,6 @@
 	 * 设备名称
 	 */
 	@ApiModelProperty(value = "设备名称", required = true)
-	@NotEmpty
 	private String deviceName;
 	/**
 	 * 设备类型（察打一体/便捷侦测箱/反制枪）
@@ -102,6 +101,12 @@
 	private BigDecimal effectiveRangeKm;
 
 	/**
+	 * 有效范围 km
+	 */
+	@ApiModelProperty(value = "是否有范围 0不过滤 1有 2没有")
+	private int effectiveRangeKmIsNotNull ;
+
+	/**
 	 * 设备状态，多个状态用逗号隔
 	 */
 	@ApiModelProperty(value = "设备状态，多个状态用逗号隔开")

--
Gitblit v1.9.3