From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
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