Merge branch 'Develop'

pansen

2018-12-26 e1d7e82725a6ee591b399f89544b64a4f07b624d

 .gitignore

@@ -19,3 +19,7 @@
*.exe
*.out
*.app

QiaoJiaSystem/\.idea/

QiaoJiaSystem/cmake-build-debug/