Merge remote-tracking branch 'origin/master'

linwei

2026-01-09 bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b

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

@@ -16,6 +16,7 @@
 */
package org.sxkj.fw.device.mapper;

import org.sxkj.fw.device.dto.FwDeviceMaintainRecordDTO;
import org.sxkj.fw.device.entity.FwDeviceMaintainRecordEntity;
import org.sxkj.fw.device.vo.FwDeviceMaintainRecordVO;
import org.sxkj.fw.device.excel.FwDeviceMaintainRecordExcel;
@@ -40,7 +41,7 @@
    * @param fwDeviceMaintainRecord
    * @return
    */
   List<FwDeviceMaintainRecordVO> selectFwDeviceMaintainRecordPage(IPage page, FwDeviceMaintainRecordVO fwDeviceMaintainRecord);
   List<FwDeviceMaintainRecordVO> selectFwDeviceMaintainRecordPage(IPage page, FwDeviceMaintainRecordDTO fwDeviceMaintainRecord);


   /**