Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

 src/main/java/com/ruoyi/technology/mapper/TechnologyOperationMapper.java

@@ -1,8 +1,13 @@
package com.ruoyi.technology.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.technology.bean.dto.TechnologyOperationDto;
import com.ruoyi.technology.bean.vo.TechnologyOperationVo;
import com.ruoyi.technology.pojo.TechnologyOperation;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * <p>
@@ -15,4 +20,5 @@
@Mapper
public interface TechnologyOperationMapper extends BaseMapper<TechnologyOperation> {

    IPage<TechnologyOperationVo> listPage(Page<TechnologyOperationDto> page, @Param("c") TechnologyOperationDto technologyOperationDto);
}