Merge remote-tracking branch 'origin/master'

linwei

2026-02-03 4a6c8a672dc22fe730c0d891eb42b31f2f06f713

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java

@@ -70,13 +70,11 @@
         return R.fail("参数错误");
      }

      FwDeviceScrapEntity detail = fwDeviceScrapService.getOne(
            Condition.getQueryWrapper(
                  FwDeviceScrapWrapper.build().entityDTO(fwDeviceScrap)));
      FwDeviceScrapVO detail = fwDeviceScrapService.getFwDeviceScrapById(fwDeviceScrap.getId());
      if (detail == null) {
         return R.fail("数据不存在");
      }
      return R.data(FwDeviceScrapWrapper.build().entityVO(detail));
      return R.data(detail);
   }

   /**