From f53e1204bd4a21f74cb5872030f1eadf231eedc7 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期六, 05 一月 2019 19:48:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 69ee27b..5d67869 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -174,7 +174,7 @@
std::vector<std::string> forEachFile(const std::string &dir_name);
- qint64 getVideoTime(const std::string& videoPath);
+ qint64 getVideoTime(/*const std::string& videoPath,*/std::string& str_tmpTime);
};
#endif
--
Gitblit v1.8.0