Merge remote-tracking branch 'origin/master'

xiebin

2026-01-21 c84b9c443d33f0fa8619a4d929363b4ec7b0c9a1

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

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
import org.sxkj.gd.orderdata.param.GdDataEvaluationPageParam;
import org.sxkj.gd.orderdata.vo.GdDataEvaluationVO;
import org.sxkj.gd.orderdata.excel.GdDataEvaluationExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,7 +39,7 @@
    * @param gdDataEvaluation
    * @return
    */
   IPage<GdDataEvaluationVO> selectGdDataEvaluationPage(IPage<GdDataEvaluationVO> page, GdDataEvaluationVO gdDataEvaluation);
   IPage<GdDataEvaluationVO> selectGdDataEvaluationPage(IPage<GdDataEvaluationVO> page, GdDataEvaluationPageParam gdDataEvaluation);


   /**