Merge remote-tracking branch 'origin/master'

linwei

2026-01-09 bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b

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

@@ -17,11 +17,13 @@
package org.sxkj.fw.device.service;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
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;

/**
@@ -31,6 +33,14 @@
 * @since 2026-01-08
 */
public interface IFwDeviceScrapService extends BaseService<FwDeviceScrapEntity> {

   /**
    * 新增报废记录
    * @param dto 报废记录
    * @return true/false
    */
   boolean saveFwDeviceScrap(FwDeviceScrapDTO dto);

   /**
    * 自定义分页
    *
@@ -38,7 +48,7 @@
    * @param fwDeviceScrap
    * @return
    */
   IPage<FwDeviceScrapVO> selectFwDeviceScrapPage(IPage<FwDeviceScrapVO> page, FwDeviceScrapVO fwDeviceScrap);
   IPage<FwDeviceScrapVO> selectFwDeviceScrapPage(IPage<FwDeviceScrapVO> page, FwDeviceScrapDTO fwDeviceScrap);


   /**