Merge remote-tracking branch 'origin/master'

xiebin

2026-01-17 2e0b7e66be6b6f48cee02c009d08ff991326addd

 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;