Revert "提交代码"

This reverts commit 83d7b8a6085910ae37ceab675eacb1ee8d90ea56.
Merge branch 'master' of https://github.com/rspMarie/testproject

Conflicts:
	Classes/Buy.h