Merge remote-tracking branch 'origin/master'

czt

3 天以前 dfd2060bdcc0de929b4770a6a4a580c17bd72104

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

@@ -86,14 +86,16 @@
        if (data.getChanNum() == 0) {
            data.setChanNum(1);
        }
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());
        if(StringUtils.isEmpty(data.getId())){
            data.setId(ContextUtil.generateId());
            data.setCreateBy(ContextUtil.getLoginUserName());
            data.setCreateTime(new Date());
            cameraMapper.insert(data);
        }else {
            cameraMapper.updateById(data);
        }
        data.setUpdateBy(ContextUtil.getLoginUserName());
        data.setUpdateTime(new Date());
        cameraMapper.insert(data);
    }

    /**