rechange aa
Merge branch 'master' of github.com:yoution/generator-cmcc into aaaa
b2 change
aa change