...
Merge branch 'master' of https://github.com/xjx0524/qiangfan

Conflicts:
	goods.php