From 8c80a8d7d70d0aa19fe194df49c21a88d2ba7589 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 26 十月 2023 20:58:30 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java b/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java index fda52c9..84df694 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java +++ b/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) { -- Gitblit v1.8.0