Merge pull request #10 from qatang/dev

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

merge