From c8cc61e84189d8f986f7c4657d543408021b3da0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 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