From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 16 Nov 2020 13:16:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/mapper/HistoryMapper.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java index 5ab081a..74c339e 100644 --- a/src/main/java/com/moral/mapper/HistoryMapper.java +++ b/src/main/java/com/moral/mapper/HistoryMapper.java @@ -43,4 +43,6 @@ String getJsonData(@Param("mac") String mac, @Param("time") String time, @Param("table") String table); + + Map<String,Object> getDailyAvgData(@Param("mId")String mId,@Param("time")String time); } \ No newline at end of file -- Gitblit v1.8.0