Merge remote-tracking branch 'origin/master'

linwei

2026-01-19 1f9f5596657af4af7e4e7da735358a0f00d64bbc

 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandMapper.java

@@ -17,6 +17,7 @@
package org.sxkj.gd.orderdata.mapper;

import org.sxkj.gd.orderdata.entity.GdSupplyDemandEntity;
import org.sxkj.gd.orderdata.param.GdSupplyDemandPageParam;
import org.sxkj.gd.orderdata.vo.GdSupplyDemandVO;
import org.sxkj.gd.orderdata.excel.GdSupplyDemandExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@
    * @param gdSupplyDemand
    * @return
    */
   List<GdSupplyDemandVO> selectGdSupplyDemandPage(IPage page, GdSupplyDemandVO gdSupplyDemand);
   List<GdSupplyDemandVO> selectGdSupplyDemandPage(IPage page, @Param("param") GdSupplyDemandPageParam gdSupplyDemand);


   /**