Merge branch 'master' into Develop

pansen

2019-01-04 a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d

 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