From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq

---
 QiaoJiaSystem/RapidStructureApp/main.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/RapidStructureApp/main.cpp b/QiaoJiaSystem/RapidStructureApp/main.cpp
index d4192b9..c1b710a 100644
--- a/QiaoJiaSystem/RapidStructureApp/main.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/main.cpp
@@ -5,7 +5,7 @@
 using namespace std;
 
 int main(int argc, char **argv) {
-
+    std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
     vector<string> vec;
     vec.push_back("/home/bsk/test/1/load/");
 //    vec.push_back("/home/bsk/2/load/");

--
Gitblit v1.8.0