Merge remote-tracking branch 'origin/dev' into cjl-230812

cjl

2023-08-18 41660a11fb793295d44a4d47949284105e429395

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

@@ -181,6 +181,9 @@
            datas.put("dataTime", time);
        } else {
            datas = queryLastDataByMac(mac);
            if (ObjectUtils.isEmpty(datas)){
                return null;
            }
        }
        //构建返回对象
        Map<String, Object> result = new HashMap<>();