jiang obj shanchu
Merge branch 'master' of https://github.com/JackSnowolf/MUEIMS

Conflicts:
	EnterpriseSystemASPXBg/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.csproj.FileListAbsolute.txt
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.csprojResolveAssemblyReference.cache
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.dll
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.pdb