Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 QiaoJiaSystem/VideoServer/QiaoJia/main.cpp

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

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

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