Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-09 ce7964aba19721cebdd9eb7d475ac651a6dca6bf

 ycl-server/src/main/java/com/ycl/platform/mapper/ReportMapper.java

@@ -1,5 +1,6 @@
package com.ycl.platform.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.platform.domain.entity.Report;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.query.ReportQuery;
@@ -7,6 +8,7 @@
import com.ycl.platform.domain.form.ReportForm;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * 报备 Mapper 接口
@@ -17,5 +19,5 @@
@Mapper
public interface ReportMapper extends BaseMapper<Report> {

    List<ReportVO> page(ReportQuery query);
    IPage<ReportVO> page(IPage page, @Param("query") ReportQuery query);
}