From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/HistoryDailyMapper.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryDailyMapper.java b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
index c7122fd..ee8532a 100644
--- a/src/main/java/com/moral/mapper/HistoryDailyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
@@ -1,5 +1,7 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
import java.util.List;
import java.util.Map;
@@ -12,4 +14,5 @@
// ���������������������������������������������
Map<String, Double> getTraceabilityData(Map<String, Object> parameters);
+ List<Map<String, Object>> getDataByTimeSlot(@Param("mac") String mac, @Param("startTime") String startTime, @Param("endTime") String endTime);
}
--
Gitblit v1.8.0