Merge branch 'ywv12' into ywv1.2

pansen

2019-02-20 5bff300cf314e7e61c6db75d634ef6a00add48e6

 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