Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-03-08 09481ada804b04e6458c8fa462e187a9b3007ee7

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

@@ -56,6 +56,7 @@
    public ResponseVO<Object> pushToLed(@PathVariable Long plianId,@RequestBody List<String> playerIds) {
        return ResponseUtil.success(playPlanNvService.pushToLed(plianId,playerIds));
    }

    @GetMapping("/listPlan")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());