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

pans

2019-04-16 051c6863dd418c9cfbca787e449fbdeadde977c7

 .gitignore

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

QiaoJiaSystem/build/\.fuse_hidden*


QiaoJiaSystem/enctest/cmake-build-debug/