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

chenshijun

2019-03-15 25f94726888e19d6efed7b393217d9f56a0ca767

 .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*