Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

pans

2019-03-30 99221e4721a1246883465c2b52fbff14eb9aaa7a

 QiaoJiaSystem/VideoServer/QiaoJia/main.cpp

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

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

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