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

pansen

2019-01-15 9bbbe29c81aa9cd183e840232f2bd973937d1ef4

 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