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

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

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

@@ -132,7 +132,7 @@
     */
    public String checkCameraIpAndPortUnique(ArdCameras camera);

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

    public Boolean getCameraOperationByCameraId(String id,String userId);