Merge pull request #1 from qatang/master

同步
上传
Merge pull request #2 from qatang/dev

Dev
角色
角色
test
test
角色更新
Merge pull request #3 from qatang/dev

merge
Merge pull request #10 from zzqjava/master

更新角色