From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java
index 53c7a51..7bf8a04 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/UploadRealTimeMonitoringDataService.java
@@ -8,7 +8,7 @@
import java.text.ParseException;
import java.util.List;
-
+import java.util.Date;
public interface UploadRealTimeMonitoringDataService extends BaseService<UploadRealTimeMonitoringData> {
/**
@@ -35,5 +35,5 @@
* @param endTime 结束时间
* @return
*/
- List<UploadRealTimeMonitoringData> getRangeTimeData(String startTime, String endTime);
+ List<UploadRealTimeMonitoringData> getRangeTimeData(Date startTime, Date endTime);
}
--
Gitblit v1.7.1