Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-10-18 5586964c3e63f95c9e460a6a3d85d7dca408e096

 screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java

@@ -51,9 +51,12 @@
        wrapper.eq("mac",mac);
        wrapper.eq("time",date);
        List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper);
        if(ObjectUtils.isEmpty(historyDailies))
            return null;
        return historyDailies.get(0);
    }


    @Override
    public Map<String, HistoryDaily> getHistoryDailyByMacsAndDate(List<String> mac, Date date) {
        QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>();