From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/service/business/SitesService.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/SitesService.java b/server/services/src/main/java/com/doumee/service/business/SitesService.java
index 987001a..20d0712 100644
--- a/server/services/src/main/java/com/doumee/service/business/SitesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/SitesService.java
@@ -115,9 +115,8 @@
      * @param pageWrap 鍒嗛〉瀵硅薄
      * @return PageData<Sites>
      */
-    PageData<SitesMonitorDTO> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap);
+    PageData<Sites> findSitesMonitorDTOPage(PageWrap<SitesMonitorDTO> pageWrap);
 
 
-    PageData<SitesMonitorBikeDTO> getSitesMonitorBikeDTO(PageWrap<SitesMonitorDTO> pageWrap);
 
 }

--
Gitblit v1.9.3