Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pans

2019-03-14 07fb2c16c75734d8c127585353249f529ea1262c

 QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp

@@ -61,11 +61,11 @@
                sleep(1);
            }
        } else {
            ERR("searchCamDevTableAll size is 0");
            ERR("searchCamDevTableByType size is 0");
        }

    } else {
        auto lst = m_lDBTool->searchCamDevTableAll();
        auto lst = m_lDBTool->searchCamDevTableByType(0);
        Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();

        //设置视频的最长和最短时间间隔
@@ -116,7 +116,7 @@
//
//        }
        } else {
            ERR("searchCamDevTableAll size is 0");
            ERR("searchCamDevTableByType size is 0");
        }
    }
}