From 245e62f87e29b22b1824d5361d073acaa06ceed9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 七月 2025 11:11:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
index 57081db..5c0dab0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
@@ -178,7 +178,7 @@
res.add(temp);
}
pageInfo.setRecords(res);
- return R.ok();
+ return R.ok(pageInfo);
}
@ApiOperation(value = "根据片区id查询保洁员列表 不分页")
@GetMapping(value = "/listCleaner")
@@ -275,6 +275,8 @@
@GetMapping("/import-template")
public void importTemplate() {
List<TLocationImportExcel> locationImportExcels = new ArrayList<>();
+ TLocationImportExcel tLocationImportExcel = new TLocationImportExcel();
+ locationImportExcels.add(tLocationImportExcel);
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TLocationImportExcel.class, locationImportExcels);
HttpServletResponse response = WebUtils.response();
ServletOutputStream outputStream = null;
--
Gitblit v1.7.1