Merge remote-tracking branch 'origin/Develop' into Develop

chenshijun

2018-12-20 7396acaaf172f25c7bf110e930a74cc133c5d342

 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