From 84e740f362d574b942b1c9a274425841c9167de8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java |    3 ++-
 1 files changed, 2 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 ac90e66..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,8 +26,9 @@
 
     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