From fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 28 二月 2019 20:22:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2
---
QiaoJiaSystem/VideoServer/QiaoJia/main.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/main.cpp b/QiaoJiaSystem/VideoServer/QiaoJia/main.cpp
index be0bab1..803b03b 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/main.cpp
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/main.cpp
@@ -15,7 +15,7 @@
int main(int argc, char *argv[])
{
-
+ std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
{
CallBackFunc callf;
--
Gitblit v1.8.0