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

Conflicts:
	BusinessOrder/bin/Debug/BusinessOrder.dll
	BusinessOrder/bin/Debug/BusinessOrder.pdb
	BusinessOrder/bin/Debug/DataModel.dll
	BusinessOrder/bin/Debug/DataModel.pdb
	BusinessOrder/bin/Debug/IBusinessOrder.dll
	BusinessOrder/bin/Debug/IBusinessOrder.pdb
	DataModel/bin/Debug/DataModel.dll
	DataModel/bin/Debug/DataModel.pdb
	IBusinessOrder/bin/Debug/DataModel.dll
	IBusinessOrder/bin/Debug/DataModel.pdb
	IBusinessOrder/bin/Debug/IBusinessOrder.dll
	IBusinessOrder/bin/Debug/IBusinessOrder.pdb
	Tools/bin/Debug/BusinessOrder.dll
	Tools/bin/Debug/BusinessOrder.pdb
	Tools/bin/Debug/BusinessTemplate.dll
	Tools/bin/Debug/BusinessTemplate.pdb
	Tools/bin/Debug/DataModel.dll
	Tools/bin/Debug/DataModel.pdb
	Tools/bin/Debug/IBusinessOrder.dll
	Tools/bin/Debug/IBusinessOrder.pdb
	huwaipingtai/Product/1000000011/index.html
	huwaipingtai/bin/BusinessOrder.dll
	huwaipingtai/bin/BusinessOrder.pdb
	huwaipingtai/bin/BusinessTemplate.dll
	huwaipingtai/bin/BusinessTemplate.pdb
	huwaipingtai/bin/DataModel.dll
	huwaipingtai/bin/DataModel.pdb
	huwaipingtai/bin/IBusinessOrder.dll
	huwaipingtai/bin/IBusinessOrder.pdb
	huwaipingtai/bin/huwaipingtai.dll
	huwaipingtai/bin/huwaipingtai.pdb
1