From 9a156c3e20c9dd5c1215bd5dfec5677388777749 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Oct 2023 14:53:00 +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 |    2 +-
 1 files changed, 1 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 b22bf87..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,7 +26,7 @@
 
     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);
 

--
Gitblit v1.8.0