Merge remote-tracking branch 'origin/master'

sgj

2026-01-05 7b973b3b9b723f48c54f2c0c5083886573224541

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SecCameraService.java

@@ -99,6 +99,21 @@
    }

    /**
     * 远程拉取监控信息后更新
     * @param data
     */
    public void pullUpdateCamera(Camera data) {
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());
        int i = cameraMapper.updateById(data);
        if(i == 0){
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
            cameraMapper.insert(data);
        }
    }

    /**
     * 删除数据
     * @param data
     * @return