Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 .gitignore

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

QiaoJiaSystem/build/\.fuse_hidden*


QiaoJiaSystem/enctest/cmake-build-debug/