Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pans

2019-03-14 07fb2c16c75734d8c127585353249f529ea1262c

 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/
)