个人信息
个人信息
Merge remote-tracking branch 'origin/master'

Conflicts:
	HADWINS.Business/bin/Debug/HADWINS.Business.dll
	HADWINS.Business/bin/Debug/HADWINS.Business.pdb
	HADWINS.Business/bin/Debug/HADWINS.DBUtility.dll
	HADWINS.Business/bin/Debug/HADWINS.DBUtility.pdb
	HADWINS.Business/bin/Debug/HADWINS.Domain.dll
	HADWINS.Business/bin/Debug/HADWINS.Domain.pdb

	HADWINS.Business/obj/Debug/HADWINS.Business.csprojResolveAssemblyReference.cache
	HADWINS.Business/obj/Debug/HADWINS.Business.dll
	HADWINS.Business/obj/Debug/HADWINS.Business.pdb
	HADWINS.DBUtility/bin/Debug/HADWINS.DBUtility.dll
	HADWINS.DBUtility/bin/Debug/HADWINS.DBUtility.pdb
	HADWINS.DBUtility/obj/Debug/HADWINS.DBUtility.dll
	HADWINS.DBUtility/obj/Debug/HADWINS.DBUtility.pdb
	HADWINS.Domain/bin/Debug/HADWINS.DBUtility.dll
	HADWINS.Domain/bin/Debug/HADWINS.DBUtility.pdb
	HADWINS.Domain/bin/Debug/HADWINS.Domain.dll
	HADWINS.Domain/bin/Debug/HADWINS.Domain.pdb
	HADWINS.Domain/obj/Debug/HADWINS.Domain.csproj.FileListAbsolute.txt

	HADWINS.Domain/obj/Debug/HADWINS.Domain.csprojResolveAssemblyReference.cache
	HADWINS.Domain/obj/Debug/HADWINS.Domain.dll
	HADWINS.Domain/obj/Debug/HADWINS.Domain.pdb
	HADWINS.Resource/obj/Debug/HADWINS.Resource.csproj.FileListAbsolute.txt

	HADWINS.Resource/obj/Debug/HADWINS.Resource.csproj.GenerateResource.Cache
	HADWINS.UnitTest/bin/Debug/HADWINS.Business.dll
	HADWINS.UnitTest/bin/Debug/HADWINS.Business.pdb
	HADWINS.UnitTest/bin/Debug/HADWINS.DBUtility.dll
	HADWINS.UnitTest/bin/Debug/HADWINS.DBUtility.pdb
	HADWINS.UnitTest/bin/Debug/HADWINS.Domain.dll
	HADWINS.UnitTest/bin/Debug/HADWINS.Domain.pdb
	HADWINS.UnitTest/bin/Debug/HADWINS.UnitTest.dll
	HADWINS.UnitTest/bin/Debug/HADWINS.UnitTest.pdb

	HADWINS.UnitTest/obj/Debug/HADWINS.UnitTest.csprojResolveAssemblyReference.cache
	HADWINS.UnitTest/obj/Debug/HADWINS.UnitTest.dll
	HADWINS.UnitTest/obj/Debug/HADWINS.UnitTest.pdb
	HADWINS.WEB/bin/HADWINS.Business.dll
	HADWINS.WEB/bin/HADWINS.Business.pdb
	HADWINS.WEB/bin/HADWINS.DBUtility.dll
	HADWINS.WEB/bin/HADWINS.DBUtility.pdb
	HADWINS.WEB/bin/HADWINS.Domain.dll
	HADWINS.WEB/bin/HADWINS.Domain.pdb
	HADWINS.WEB/bin/HADWINS.WEB.dll
	HADWINS.WEB/bin/HADWINS.WEB.pdb
	HADWINS.WEB/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	HADWINS.WEB/obj/Debug/HADWINS.WEB.csproj.FileListAbsolute.txt
	HADWINS.WEB/obj/Debug/HADWINS.WEB.csprojResolveAssemblyReference.cache
	HADWINS.WEB/obj/Debug/HADWINS.WEB.dll
	HADWINS.WEB/obj/Debug/HADWINS.WEB.pdb