Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-05 f53e1204bd4a21f74cb5872030f1eadf231eedc7

 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,*/std::string& str_tmpTime);
};

#endif