Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-03-15 e2ec42921840535c445e40b76661d0ffd9baef8f

 QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt

@@ -20,7 +20,6 @@
    ../../../../BasicPlatForm/libs/jsoncpp/lib
)


add_executable(syncDBClient
    main.cpp