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

pansen

2019-03-06 6f27f088e5d9e828bdce65ab85984d2084bab222

 QiaoJiaSystem/EncodeServer/main.cpp

@@ -28,7 +28,7 @@
int main(int argc, char **argv) {
    SAVE_APP_ARGS
    ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());

    std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
    EncodeVideoManager  encodeVideoManager;
    encodeVideoManager.start();