Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 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;