试试能不能推送
Merge branch 'master' of github.com:1014582610/housemanagement

Conflicts:
	MuBanYeTest/HomeManagementSystem.v11.suo
	MuBanYeTest/MuBanYeTest/HomeManagementSystem.csproj
	MuBanYeTest/MuBanYeTest/bin/MuBanYeTest.dll
	MuBanYeTest/MuBanYeTest/bin/MuBanYeTest.pdb
	MuBanYeTest/MuBanYeTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MuBanYeTest/MuBanYeTest/obj/Debug/HomeManagementSystem.csprojResolveAssemblyReference.cache
	MuBanYeTest/MuBanYeTest/obj/Debug/MuBanYeTest.dll
	MuBanYeTest/MuBanYeTest/obj/Debug/MuBanYeTest.pdb