Merge remote-tracking branch 'origin/master'

linwei

2026-01-08 70464cc66f77cf847464ffe71f2fd456ee11b0fb

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

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

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.fw.device.dto.FwDeviceAndTrackDTO;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
@@ -28,7 +28,7 @@
/**
 * 设备表 服务类
 *
 * @author Aix
 * @author aix
 * @since 2026-01-08
 */
public interface IFwDeviceService extends BaseService<FwDeviceEntity> {
@@ -39,7 +39,7 @@
    * @param fwDevice
    * @return
    */
   IPage<FwDeviceVO> selectFwDevicePage(IPage<FwDeviceVO> page, FwDeviceVO fwDevice);
   IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice);


   /**
@@ -49,12 +49,5 @@
    * @return
    */
   List<FwDeviceExcel> exportFwDevice(Wrapper<FwDeviceEntity> queryWrapper);

   /**
    * 添加或更新
    * @param dto
    * @return
    */
   Boolean saveFwDevice(FwDeviceAndTrackDTO dto);

}