改进gitignore列表
Merge branch 'dev-3.2.2' into dev-3.1.4