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/service/TTenantService.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java
index 8bf0ed0..6097744 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.java
@@ -2,11 +2,22 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.dto.TBillDto;
+import com.ruoyi.system.dto.TTenantDTO;
+import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.TDept;
+import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.query.TBillAppletQuery;
+import com.ruoyi.system.query.TExamineAppletQuery;
+import com.ruoyi.system.query.TTenantAppletQuery;
import com.ruoyi.system.utils.wx.pojo.AppletUserDecodeData;
import com.ruoyi.system.model.TTenant;
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 java.util.List;
import java.util.Map;
/**
@@ -25,7 +36,22 @@
* @return
*/
PageInfo<TenantVO> pageList(TTenantQuery query);
+ PageInfo<TenantVO> pageListApplet(TTenantAppletQuery query);
- Map<String, Object> wxLogin(AppletUserDecodeData appletUserDecodeData);
+
+ List<THouse> listHouse(String id);
+
+ List<TContract> listContract(String id);
+
+ PageInfo<TBillVO> listBill(TBillAppletQuery query);
+
+ PageInfo<ExamineVO> examineList(TExamineAppletQuery dto);
+
+ /**
+ * 判断租户是否已存在
+ * @param dto
+ * @return
+ */
+ boolean isExit(TTenantDTO dto);
}
--
Gitblit v1.7.1