From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 05 一月 2024 08:59:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java index e4f472b..f9b1493 100644 --- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java +++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java @@ -8,6 +8,7 @@ import com.doumee.core.model.PageData; import com.doumee.dao.admin.response.DeviceEventDTO; import com.doumee.dao.business.model.DeviceEvent; +import com.doumee.dao.system.vo.DeviceEventVo; import com.doumee.service.business.DeviceEventService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -79,7 +80,7 @@ @PostMapping("/exportExcel") //@RequiresPermissions("business:deviceevent:exportExcel") public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response) { - ExcelExporter.build(DeviceEvent.class).export(deviceEventService.findPage(pageWrap).getRecords(), "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃", response); + ExcelExporter.build(DeviceEventVo.class).export(deviceEventService.findDeviceEventExcel(pageWrap), "闂ㄧ浜嬩欢鎺ㄩ�佽褰曡〃", response); } @ApiOperation("鏍规嵁ID鏌ヨ") -- Gitblit v1.9.3