完善用户权限
no message
Merge branch 'master' of https://github.com/qw1210p/smart-itsm-ipad

Conflicts:
	SmartITOM/SmartITOM.xcodeproj/project.pbxproj