From 7a9f9f26ed90c33190382645d0851490ce94424b Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 10:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
index 6d07749..6b496dd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
@@ -106,7 +106,7 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<VisitEvent>
*/
- PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEvent> pageWrap);
+ PageData<VisitEvent> findVisitPage(PageWrap<VisitEvent> pageWrap);
/**
@@ -114,5 +114,5 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<VisitEventVo>
*/
- List<VisitEventVo> findPageExcel(PageWrap<VisitEvent> pageWrap);
+ List<VisitEvent> findPageExcel(PageWrap<VisitEvent> pageWrap);
}
--
Gitblit v1.9.3