Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-07-21 1393ec7b94738419acbfd340cf24d3debaa2b73e

 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<>();