Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-21 12df23a559dd0e3571eebe78dbed825fc73d82ec

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java

@@ -194,6 +194,12 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);
        poleLightemitEntityList.forEach(
                led->{
                    led.setStreetlightId(led.getPoleId());
                    led.setStreetlightName(led.getPoleName());
                }
        );

        CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);
        int size = poleLightemitEntityList.size();