Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 .gitignore

@@ -56,3 +56,5 @@

QiaoJiaSystem/build/\.fuse_hidden*


QiaoJiaSystem/enctest/cmake-build-debug/