Merge branch 'ywv1.2_yolodebug'

pansen

2019-01-12 29065df908aee41ab673cfc78a0d657e3063d5ef

 QiaoJiaSystem/FaceSearchServer/CMakeLists.txt

@@ -105,6 +105,7 @@
    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.h

    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp

    ../LocalDBTool/SqliteFaceEncap.cpp
    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp