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

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

 ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java

@@ -90,7 +90,7 @@
     */
    public ArdCameras checkCameraIpAndPortUnique(@Param("ip") String ip, @Param("port")Integer port);

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

    public Boolean getCameraOperationByCameraId(@Param("id") String id, @Param("userId") String userId);