From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期四, 13 三月 2025 10:46:24 +0800 Subject: [PATCH] 分支合并冲突解决 --- basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java new file mode 100644 index 0000000..9b96fc9 --- /dev/null +++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java @@ -0,0 +1,17 @@ +package com.ruoyi.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.basic.pojo.Laboratory; +import com.ruoyi.basic.pojo.Seal; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SealMapper extends BaseMapper<Seal> { + IPage<Seal>selectSeal(Page page, @Param("ew") QueryWrapper<Seal> ew); + List<Laboratory> selectLaboratory (Integer labId); + +} -- Gitblit v1.9.3