Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/java/com/moral/service/impl/HistoryFiveMinutelyServiceImpl.java

@@ -26,5 +26,11 @@
        return historyFiveMinutelyMapper.getFiveMinutesDataByMac(parameters);
    }

    @Override
    public List<Map<String, Object>> getFiveMinutesSersorDataByMacsAndTime(Map<String, Object> parameters) {
        ValidateUtil.notNull(parameters,"查询五分钟数据参数为空");
        return historyFiveMinutelyMapper.getFiveMinutesSersorDataByMacsAndTime(parameters);
    }


}