1
1
Merge branch 'master' of https://github.com/baoth/huwaipingtai

Conflicts:
	BusinessOrder/obj/Debug/BusinessOrder.dll
	BusinessOrder/obj/Debug/BusinessOrder.pdb
	CMS/obj/Debug/CMS.dll
	CMS/obj/Debug/CMS.pdb
	Common/obj/Debug/Common.dll
	Common/obj/Debug/Common.pdb
	DataModel/obj/Debug/DataModel.dll
	DataModel/obj/Debug/DataModel.pdb
	FZWeb/Controllers/TestController.cs
	FZWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	FZWeb/obj/Debug/FZ.dll
	FZWeb/obj/Debug/FZ.pdb
	IBusinessOrder/obj/Debug/IBusinessOrder.dll
	IBusinessOrder/obj/Debug/IBusinessOrder.pdb
	Toolkit/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Toolkit/obj/Debug/Toolkit.dll
	Toolkit/obj/Debug/Toolkit.pdb
	Tools/obj/Debug/BusinessTemplate.dll
	Tools/obj/Debug/BusinessTemplate.pdb
	huwaipingtai.suo
	huwaipingtai/obj/Debug/huwaipingtai.dll
	huwaipingtai/obj/Debug/huwaipingtai.pdb
1
Merge branch 'master' of https://github.com/baoth/huwaipingtai

Conflicts:
	BusinessOrder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CMS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	DataModel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	FZWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	IBusinessOrder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tools/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	huwaipingtai/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
1
Merge branch 'master' of https://github.com/baoth/huwaipingtai

Conflicts:
	huwaipingtai.suo
1