用户模块完善
表更新
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo
	MicroAssistant/MicroAssistantPortal/bin/MicroAssistantPortal.dll
	MicroAssistant/MicroAssistantPortal/bin/MicroAssistantPortal.pdb
	MicroAssistant/MicroAssistantPortal/obj/Debug/MicroAssistantPortal.dll
	MicroAssistant/MicroAssistantPortal/obj/Debug/MicroAssistantPortal.pdb