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

pansen

2019-03-15 e2ec42921840535c445e40b76661d0ffd9baef8f

 QiaoJiaSystem/VideoToImage/CMakeLists.txt

@@ -68,7 +68,7 @@
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
    /usr/include/x86_64-linux-gnu/qt5/QtSql/

    ../../BasicPlatForm/libs/hiredis-master/include
    ../../../BasicPlatForm/libs/hiredis-master/include
    ../../../BasicPlatForm/basic/timer_counter/
)