From 04d2f146d27f9e4dbfb52d71b3092db764629167 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 13:47:52 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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
index 8bf23ff..969a401 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java
@@ -3,7 +3,11 @@
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.TTenantAppletQuery;
import com.ruoyi.system.query.TTenantQuery;
+import com.ruoyi.system.vo.TBillVO;
+import com.ruoyi.system.vo.TenantVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -24,7 +28,10 @@
* @param pageInfo
* @return
*/
- List<TTenant> pageList(@Param("query") TTenantQuery query, @Param("pageInfo")PageInfo<TTenant> pageInfo);
+ 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);
+
}
--
Gitblit v1.7.1