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/TTenantMapper.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java
new file mode 100644
index 0000000..e0812d5
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java
@@ -0,0 +1,41 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.model.TTenant;
+import com.ruoyi.system.query.TBillAppletQuery;
+import com.ruoyi.system.query.TExamineAppletQuery;
+import com.ruoyi.system.query.TTenantAppletQuery;
+import com.ruoyi.system.query.TTenantQuery;
+import com.ruoyi.system.vo.ExamineVO;
+import com.ruoyi.system.vo.TBillVO;
+import com.ruoyi.system.vo.TenantVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+public interface TTenantMapper extends BaseMapper<TTenant> {
+
+    /**
+     * 获取租户分页列表
+     * @param query
+     * @param pageInfo
+     * @return
+     */
+    List<TenantVO> pageList(@Param("query") TTenantQuery query, @Param("pageInfo")PageInfo<TenantVO> pageInfo);
+    List<TenantVO> pageListApplet(@Param("query") TTenantAppletQuery query, @Param("pageInfo")PageInfo<TenantVO> pageInfo);
+
+
+    List<TBillVO> listBill(@Param("query") TBillAppletQuery query,@Param("pageInfo") PageInfo<TBillVO> pageInfo);
+
+    List<ExamineVO> examineList(@Param("query")TExamineAppletQuery dto, @Param("pageInfo")PageInfo<ExamineVO> pageInfo);
+
+}

--
Gitblit v1.7.1