Merge branch 'Develop' into feature_uploadPersonCutImage

pansen

2019-01-10 16b03534075d4fdbe2ec9cf3860874d91f24c01b

 .gitignore

@@ -23,3 +23,17 @@
QiaoJiaSystem/\.idea/

QiaoJiaSystem/cmake-build-debug/

QiaoJiaSystem/build/\.fuse_hidden0001973000000002

QiaoJiaSystem/DataManagerServer/cmake-build-debug/

QiaoJiaSystem/VideoAnalysFromHC/cmake-build-debug/

QiaoJiaSystem/build/glog_dump\.log
*/cmake-build-debug/
\.idea/

QiaoJiaSystem/build/\.fuse_hidden00020f790000007d

QiaoJiaSystem/build/\.fuse_hidden000210720000007e