From d8a01a15bf6f310734a18eb7740c7f5ef2d19736 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 10:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' 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