Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-10-26 8c80a8d7d70d0aa19fe194df49c21a88d2ba7589

 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java

@@ -79,6 +79,7 @@
        if (pointList.size() > 0) {
            VideoPoint videoPoint = pointList.get(0);
            if (videoPoint.getType() == 1) {
//                videoUtil.getKHPresets(code);
                return CommonResult.successApi(videoUtil.getKHVideo(code));
            } else {
                if (subType == null) {