merge no-ff
Merge branch 'dev' of github.com:beiyi/git into dev
中文hi注释