From 12cb0f2f79f216864b8f68b63309f409db68e02f Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Thu, 22 Jan 2026 11:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java
index 577edc0..1619da3 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/vo/FwDeviceConfigVO.java
@@ -87,10 +87,5 @@
 	 */
 	@ApiModelProperty(value = "状态（0正常 1停用）")
 	private Integer status;
-	/**
-	 * 删除标志（0存在 1删除）
-	 */
-	@ApiModelProperty(value = "删除标志（0存在 1删除）")
-	private Integer isDeleted;
 
 }

--
Gitblit v1.9.3