Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 QiaoJiaSystem/VideoServer/QiaoJia/main.cpp

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

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

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