Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq

chenshijun

2019-03-30 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d

 QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt

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


add_executable(syncDBClient
    main.cpp