Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-03-26 493caef7413992d0215b9c2e2bcedd30471d89e7

 ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java

@@ -131,4 +131,10 @@
     * @return 结果
     */
    public String checkCameraIpAndPortUnique(ArdCameras camera);

    public List<Map<String,Object>> getCamerasByDeptId(Long deptId,String userId);

    public Boolean getCameraOperationByCameraId(String id,String userId);

    public Map<String,Object> getChannelByCameraId(String id);
}