Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-26 407ea8abef30f30608a0cd933f7f6c35e97095be

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportDataService.java

@@ -92,7 +92,7 @@

        List<LightReportDataBo> lightReportDataBos = new ArrayList<>(pageSize);

        CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize);
        CommonPage<String> stringCommonPage = SpringContextHolder.getBean(LightService.class).listDeviceCode(pageNo, pageSize,keyword, deviceCode);
        List<String> macList = stringCommonPage.getList();
        if (CollUtil.isEmpty(macList)) {
            return new CommonPage();