Merge remote-tracking branch 'origin/master'

zss

2023-08-07 78c62a33671bdcfb0f2019c520f807a4c56fc741

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/MeteringPlanMapper.java

@@ -1,7 +1,12 @@
package com.yuanchu.limslaboratory.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.MeteringPlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.Map;
import java.util.Objects;

/**
 * <p>
@@ -13,4 +18,5 @@
 */
public interface MeteringPlanMapper extends BaseMapper<MeteringPlan> {

    IPage<Map<String, Object>> pagingQueryOfMeasurementLedger(Page<Objects> page);
}