Merge remote-tracking branch 'origin/master'

rain

2026-01-23 019f3dd14f140a3381aec0bb696e3a84f76c45e4

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.java

@@ -21,6 +21,7 @@
import org.apache.ibatis.annotations.Param;
import org.sxkj.resource.dto.WaylineJobInfoQueryParam;
import org.sxkj.resource.entity.Attach;
import org.sxkj.resource.param.AttachPageParam;
import org.sxkj.resource.vo.*;

import java.util.Date;
@@ -40,7 +41,7 @@
    * @param attach
    * @return
    */
   List<AttachVO> selectAttachPage(IPage page, @Param("attach") AttachVO attach);
   List<AttachVO> selectAttachPage(IPage page, @Param("attach") AttachPageParam attach);

   /**
    * 自定义分页