Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-05 f53e1204bd4a21f74cb5872030f1eadf231eedc7

 .gitignore

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

QiaoJiaSystem/cmake-build-debug/

*.cmake

build-QiaoJiaSystem-unknown-Default/

QiaoJiaSystem/build/glog_dump\.log