From 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 14 Nov 2023 13:50:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
index bbb87da..a725f09 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
@@ -26,6 +26,10 @@
String getDaily(Map<String,Object> params);
- List<Double> getDust(String start,String end,String mac);
+ List<String> getDust(String start,String end,String mac);
+
+ List<Map<String,Object>> getDusts(Map<String,Object> params);
+
+ List<Map<String,Object>> getAllCruiserData(Map<String,Object> params);
}
--
Gitblit v1.8.0