企业信息修改完成
Merge branch 'master' of https://github.com/xici/microassistant
右侧上角菜单权限
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo