Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h

@@ -44,6 +44,7 @@
    RWLock m_rwLock;
    std::mutex topResultMtx;
    std::map<std::thread::id, FaceResults> topResult;
    RWLock m_dbRWLocks_Lock;
    std::map<std::thread::id, RWLock> m_dbRWLocks;

    ErlangTool::ErlangDbTool *m_erlangDbTool;