Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/VideoToImageMulth/CMakeLists.txt

@@ -93,6 +93,7 @@

    ../../../BasicPlatForm/libs/hiredis-master/lib
    ../../../BasicPlatForm/libs/mysqlpp/lib
    ../../../BasicPlatForm/libs/mysql/lib
)

add_executable(${PROJECT_NAME}