Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-06 6c8f1689d545a6384046b79558e06ba32ec5dacf

 .gitignore

@@ -47,3 +47,12 @@
QiaoJiaSystem/build/\.fuse_hidden00020f790000007d

QiaoJiaSystem/build/\.fuse_hidden000210720000007e

\.idea/

QiaoJiaSystem/VideoAnalysFromHC/cmake-build-debug/

QiaoJiaSystem/DataManagerServer/cmake-build-debug/

QiaoJiaSystem/build/\.fuse_hidden*