Merge pull request #5 from qatang/dev

merge
角色更新
角色更新
Merge pull request #6 from qatang/dev

merge
Merge branch 'master' of https://github.com/zzqjava/cms
角色更新
Merge branch 'master' of https://github.com/zzqjava/cms into zzqjava-master
Merge branch 'zzqjava-master' into dev