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

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

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

@@ -564,8 +564,8 @@
    }

    @Override
    public List<Map<String, Object>> getCamerasByDeptId(Long deptId) {
        List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId);
    public List<Map<String, Object>> getCamerasByDeptId(Long deptId,String userId) {
        List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId,userId);
        return result;
    }