Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 QiaoJiaSystem/FaceDetectServer/CMakeLists.txt

@@ -53,7 +53,7 @@
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu

    #nsq
    ../../../BasicPlatForm/basic/mq/EvnsqTool/lib
    ../../../BasicPlatForm/libs/EvnsqTool/lib
    ../../../BasicPlatForm/libs/libevent/lib
)