Merge pull request #9 from qatang/dev

merge
角色更新
角色更新
Merge remote-tracking branch 'origin/master'
merge
角色更新
Merge pull request #57 from zzqjava/master

更新角色