Merge remote-tracking branch 'origin/master'

linwei

2026-01-08 70464cc66f77cf847464ffe71f2fd456ee11b0fb

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

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

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.fw.device.dto.FwDeviceTrackDTO;
import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
import org.sxkj.fw.device.vo.FwDeviceTrackVO;
import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
@@ -38,7 +39,7 @@
    * @param fwDeviceTrack
    * @return
    */
   IPage<FwDeviceTrackVO> selectFwDeviceTrackPage(IPage<FwDeviceTrackVO> page, FwDeviceTrackVO fwDeviceTrack);
   IPage<FwDeviceTrackEntity> selectFwDeviceTrackPage(IPage<FwDeviceTrackEntity> page, FwDeviceTrackDTO fwDeviceTrack);


   /**