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