大修改，接近尾声~
Merge branch 'master' of https://github.com/yht1995/ShopManageSystem

Conflicts:
	CADO.cpp
	CADO.h