权限管理--初始
Merge remote-tracking branch 'origin/master'