Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-23 b1f91d23c01266dda8cad34aa866bcac741a21cf

 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);