From b5413f1f00fcf13104b07807e2046372764ef8dc Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:12:41 +0800
Subject: [PATCH] 合并代码解决冲突
---
QiaoJiaSystem/FaceDetectServer/main.cpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/main.cpp b/QiaoJiaSystem/FaceDetectServer/main.cpp
index 2529adc..425bdde 100644
--- a/QiaoJiaSystem/FaceDetectServer/main.cpp
+++ b/QiaoJiaSystem/FaceDetectServer/main.cpp
@@ -4,6 +4,7 @@
#include <basic/util/app/AppPreference.hpp>
#include "FaceDetectServerI.h"
int main(int argc,char** argv) {
+ std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
#ifdef DEBUG
argc = 2;
const char* home = argv[0];
--
Gitblit v1.8.0