Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-01-04 10c29d85e1fe2c5a10c7e197cf3fedc72d16105e

Merge remote-tracking branch 'origin/master'

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

@@ -34,7 +34,7 @@
    @GetMapping("/list")
    public ResponseVO<Object> listLight(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
        List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
        return ResponseUtil.success(list);
        return ResponseUtil.successPage(list);
    }

    @PostMapping("/remark")