用户权限功能上传
Merge branch 'master' of https://github.com/xiaozhujun/platform

Conflicts:
	riskManagement/src/main/webapp/user/listPower.html