企业注册的时候默认添加企业权限以及用户权限判断拉取
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo
	MicroAssistant/MicroAssistantMvc/Areas/MarketingManagement/Controllers/MarketingController.cs