rebase 2
add omit file
bujv+tiaozhuan