From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
index b2eceb5..5ab0ba1 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
@@ -19,9 +19,11 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.system.entity.Tenant;
+import org.springblade.system.vo.TenantVo;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -37,7 +39,7 @@
 	 * @param tenant
 	 * @return
 	 */
-	IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant);
+	IPage<TenantVo> selectTenantPage(IPage<TenantVo> page, Tenant tenant);
 
 	/**
 	 * 根据租户编号获取实体
@@ -46,6 +48,13 @@
 	 * @return
 	 */
 	Tenant getByTenantId(String tenantId);
+
+	/**
+	 * 新增租户信息
+	 * @param tenant 租户对象信息
+	 * @return
+	 */
+	boolean insert(Tenant tenant);
 
 	/**
 	 * 新增
@@ -72,5 +81,17 @@
 	 * @return
 	 */
 	boolean setting(Integer accountNumber, Date expireTime, String ids);
-
+	int inserts(String dj,String had,String ht,String ctime,String content,String hn);
+	void updateInfoy(String dj, String had, String ht, String ctime,String content,String hn);
+	List<Map<String, Object>> selectTy(String hn);
+	List<Map<String, Object>> selectTs(String hn);
+	int insertss(String nature, String had, String motto, String ctime,String content,String hn);
+	void updateInfos(String nature, String had, String motto, String ctime,String content,String hn);
+	int insertsr(String category,String attributes,String developers,String had,String housetype,String content,String hn);
+	void updateInfor(String category,String attributes,String developers,String had,String housetype,String content,String hn);
+	List<Map<String, Object>> selectTr(String hn);
+	void deletey(String hn);
+	void deletes(String hn);
+	void deleter(String hn);
+	List<Map<String, Object>> selectListTe(String type);
 }

--
Gitblit v1.9.3