From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 14 十二月 2023 13:51:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java index 1eea46a..9bbcc39 100644 --- a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java +++ b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java @@ -98,7 +98,7 @@ boolean recordStopNotToMinio(CameraCmd cmd); //鑾峰彇鐩告満閫氶亾淇℃伅 - List<ArdChannel> getCameraChannelList(ArdCameras camera); + List<ArdChannel> getIPChannelInfo(ArdCameras camera); //鑾峰彇GIS淇℃伅鏁版嵁 Map<String, Object> getGisInfo(CameraCmd cmd); -- Gitblit v1.9.3