Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into ...

chenshijun

2019-04-03 91fbc7bca400b7ce958e306f09133e4cfc6db63b

 QiaoJiaSystem/VideoServer/QiaoJia/main.cpp

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

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

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