punish finish
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/TestSnake/TestCSRequestPunish.php
Merge remote-tracking branch 'origin/master'
punish finish
buy_goods finish
Merge remote-tracking branch 'origin/master'
请求更新装备信息 测试、完善