Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

7 天以前 e1a5409bfa2cca009160a961d9bff827ff133b1b

 ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java

@@ -44,7 +44,7 @@
    private CommonResult<List<DataDictionary>> listAll() {
        try {
                 PageResult<Camera> pageResult = videoUtil.callPostCameras(1, 20, "0");
            System.out.println("海康视频成功：" + pageResult.getTotal());
//            System.out.println("海康视频成功：" + pageResult.getTotal());
        } catch (Exception ex) {
            System.out.println("海康视频：" + ex.getMessage());
        }