Merge branch 'Develop'

pansen

2018-12-26 e1d7e82725a6ee591b399f89544b64a4f07b624d

 QiaoJiaSystem/DataManagerServer/http_configserver.h

@@ -173,6 +173,8 @@
    std::string getVideoPathByTime(const std::string& time,const std::string& camId,qint64& sub);

    std::vector<std::string> forEachFile(const std::string &dir_name);

    qint64 getVideoTime(const std::string& videoPath);
};

#endif