Merge branch 'ywv1.2' into ywv1.2_布控feature

pans

2019-01-28 53630c440d592792dcdd86f8d5b2c59da4f3c359

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