Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pans

2019-03-14 07fb2c16c75734d8c127585353249f529ea1262c

 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;