Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-10-27 d8a01a15bf6f310734a18eb7740c7f5ef2d19736

 screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java

@@ -113,6 +113,7 @@
        /*if(monitorPoint.contains("")){

        }*/
        params.put("monitorPointList", monitorPoint);
        String[] monitorPointIds = monitorPoint.split(",");
        if (monitorPointIds.length > 3) {
            return ResultMessage.ok();