From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 19 三月 2025 15:50:03 +0800 Subject: [PATCH] fix: resolve merge conflicts in .gitignore --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java index f02e0a2..7ded449 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java @@ -1,7 +1,13 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TItemType; +import com.ruoyi.system.query.TItemTypeQuery; +import com.ruoyi.system.vo.TItemTypeVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * <p> @@ -13,4 +19,15 @@ */ public interface TItemTypeMapper extends BaseMapper<TItemType> { + /** + * 获取维修物品分类管理列表 + * @param query + * @param pageInfo + * @return + */ + List<TItemType> pageList(@Param("query") TItemTypeQuery query, @Param("pageInfo")PageInfo<TItemType> pageInfo); + + List<TItemTypeVO> getItemList(@Param("itemName") String itemName); + + } -- Gitblit v1.7.1