查看order，删除order
确认订单信息
Merge branch 'master' of github.com:zzjove/PinPeng

Conflicts:
	PinPeng/WebRoot/WEB-INF/classes/hibernate.cfg.xml
	PinPeng/WebRoot/WEB-INF/classes/web/action/control/ConfirmRequestAction.class
	PinPeng/src/hibernate.cfg.xml
	PinPeng/src/web/action/control/ConfirmRequestAction.java