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

chenshijun

2019-03-15 25f94726888e19d6efed7b393217d9f56a0ca767

 QiaoJiaSystem/VideoServer/QiaoJia/main.cpp

@@ -15,7 +15,7 @@

int main(int argc, char *argv[])
{

    std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
    {
        CallBackFunc callf;