Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-01-12 8da27238ae8ed8a6963d13d9a4aede301ac22d32

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

@@ -56,12 +56,12 @@
    @GetMapping("/report/list")
    public ResponseVO<Object> listReportData(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
        List<LightReportDataBo> list = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        return ResponseUtil.success(list);
        return ResponseUtil.successPage(list);
    }

    @GetMapping("/error/list")
    public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
        List<LightReportErrorBo> list = lightReportErrorService.listReportError(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
        return ResponseUtil.success(list);
        return ResponseUtil.successPage(list);
    }
}