Merge pull request #8 from qatang/dev

merge
角色更新
Merge pull request #51 from zzqjava/master

更新角色