From 52f8e08715abd234c3bd6908e4338b1da1d8b0b4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 13:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
index 931e469..2854abb 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceEventService.java
@@ -5,6 +5,8 @@
import com.doumee.dao.admin.request.DeviceEventQuery;
import com.doumee.dao.admin.response.DeviceEventDTO;
import com.doumee.dao.business.model.DeviceEvent;
+import com.doumee.dao.system.vo.DeviceEventVo;
+
import java.util.List;
/**
@@ -103,5 +105,12 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<DeviceEvent>
*/
- PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEventQuery> pageWrap);
+ PageData<DeviceEventDTO> findDeviceEventDTOPage(PageWrap<DeviceEvent> pageWrap);
+
+ /**
+ * 瀵煎嚭
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<DeviceEventVO>
+ */
+ List<DeviceEventVo> findDeviceEventExcel(PageWrap<DeviceEvent> pageWrap);
}
--
Gitblit v1.9.3