From c04afebf9cebfd65bf55c2395e732f36f558d208 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 10:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java
index b3b63a6..6311be7 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceScrapController.java
+++ b/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);
}
/**
--
Gitblit v1.9.3