From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.java
index 6001f61..bddf56f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.java
@@ -16,13 +16,15 @@
*/
package org.sxkj.fw.device.mapper;
-import org.sxkj.fw.device.entity.FwDeviceScrapEntity;
-import org.sxkj.fw.device.vo.FwDeviceScrapVO;
-import org.sxkj.fw.device.excel.FwDeviceScrapExcel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.sxkj.fw.device.dto.FwDeviceScrapDTO;
+import org.sxkj.fw.device.entity.FwDeviceScrapEntity;
+import org.sxkj.fw.device.excel.FwDeviceScrapExcel;
+import org.sxkj.fw.device.vo.FwDeviceScrapVO;
+
import java.util.List;
/**
@@ -34,13 +36,20 @@
public interface FwDeviceScrapMapper extends BaseMapper<FwDeviceScrapEntity> {
/**
+ * 获取详情
+ * @param id 计划id
+ * @return 计划详情
+ */
+ FwDeviceScrapVO getFwDeviceScrapById(@Param("id") Long id);
+
+ /**
* 自定义分页
*
* @param page
* @param fwDeviceScrap
* @return
*/
- List<FwDeviceScrapVO> selectFwDeviceScrapPage(IPage page, FwDeviceScrapVO fwDeviceScrap);
+ List<FwDeviceScrapVO> selectFwDeviceScrapPage(IPage page, FwDeviceScrapDTO fwDeviceScrap);
/**
--
Gitblit v1.9.3