add ignore list
add from local
add from feature1
Merge branch 'master' of https://github.com/lzz19851128/testGit