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/THouseMapper.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/THouseMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/THouseMapper.java new file mode 100644 index 0000000..1cafeac --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/THouseMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.system.model.THouse; +import com.ruoyi.system.query.THouseQuery; +import com.ruoyi.system.query.TUserHistoryQuery; +import com.ruoyi.system.vo.HouseVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * <p> + * 房屋管理 Mapper 接口 + * </p> + * + * @author xiaochen + * @since 2025-01-17 + */ +public interface THouseMapper extends BaseMapper<THouse> { + + List<THouse> houseList(@Param("req") THouseQuery query, @Param("pageInfo") PageInfo<THouse> pageInfo); + + List<HouseVO> userHistoryList(@Param("req")TUserHistoryQuery query, @Param("pageInfo")PageInfo<HouseVO> pageInfo); + +} -- Gitblit v1.7.1