From 3f54b5827ca396ff6c843808698f3d1e7d973a80 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 17 Nov 2023 18:02:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/controller/HouseRentalController.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
index 092beec..22cdc98 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -189,14 +189,12 @@
 	}
 
 	/**
-	 * 导出用户
+	 * 导出租赁信息
 	 */
-	@GetMapping("export-house")
-	@ApiOperationSupport(order = 13)
-	@ApiOperation(value = "导出出租房屋", notes = "传入user")
-	public void exportUser(HouseRentalVO houseRentalVO, HttpServletResponse response) {
+	@GetMapping("export-houseRental")
+	public void exportHouseRental(HouseRentalTenantVO houseRentalVO, HttpServletResponse response) {
 		List<HouseRentalExcel> list = houseRentalService.export(houseRentalVO);
-		ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, HouseRentalExcel.class);
+		ExcelUtil.export(response, "出租屋数据" + DateUtil.time(), "出租屋数据表", list, HouseRentalExcel.class);
 	}
 
 

--
Gitblit v1.9.3