From 6f27f088e5d9e828bdce65ab85984d2084bab222 Mon Sep 17 00:00:00 2001 From: pansen <pansen626@sina.com> Date: 星期三, 06 三月 2019 11:52:47 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2 --- QiaoJiaSystem/EncodeServer/main.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/EncodeServer/main.cpp b/QiaoJiaSystem/EncodeServer/main.cpp index 71056e1..fe839d4 100644 --- a/QiaoJiaSystem/EncodeServer/main.cpp +++ b/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(); -- Gitblit v1.8.0