From 25f94726888e19d6efed7b393217d9f56a0ca767 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 18:44:46 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/StructureApp/AppPipeController.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.h b/QiaoJiaSystem/StructureApp/AppPipeController.h
index 2018f12..367af7a 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.h
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.h
@@ -116,10 +116,10 @@
int m_index;
std::string m_camId;
std::string m_folderPath;
- Json::Value m_json;
- Json::Value m_json_Record;
+// Json::Value m_json;
+// Json::Value m_json_Record;
+// Json::FastWriter m_fastWriter;
- Json::FastWriter m_fastWriter;
FastFdsWithLock *fdfsClient;
bool bRecordVideoEnable;
--
Gitblit v1.8.0