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

Conflicts:
	huwaipingtai/bin/BusinessOrder.dll
	huwaipingtai/bin/BusinessTemplate.dll
	huwaipingtai/bin/Common.dll
	huwaipingtai/bin/Common.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