From f799d1ec5a439003baf2ec6d7a5919718cfdcc14 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 17 Jan 2026 17:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
index 1f3e716..6ce9d12 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
@@ -59,6 +59,7 @@
 			FwDeviceEntity fwDevice = new FwDeviceEntity();
 			fwDevice.setId(dto.getDeviceId());
 			fwDevice.setStatus(3);
+			fwDevice.setIsDeleted(1);
 			isSuccess = fwDeviceService.updateById(fwDevice);
 		}
 		return isSuccess;

--
Gitblit v1.9.3