From 08b52ba6e8930958456ed58a1d39805caa7fe014 Mon Sep 17 00:00:00 2001 From: cjl <chenjl@deyt.cn> Date: Wed, 12 Jul 2023 20:24:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into dev --- screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java index 6b5bfa3..24e4dbd 100644 --- a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java +++ b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java @@ -21,6 +21,8 @@ String selectHourlyData(Map<String,Object> params); + List<Map<String,Object>> selectHourlyListData(Map<String,Object> params); + List<Map<String,Object>> selectDataByMacsAndTime(@Param("timeUnits") String timeUnits, @Param("list")List list, @Param("time")String time); -- Gitblit v1.8.0