add d
Merge branch 'master' of https://github.com/kalvenwong/struts.git

Conflicts:
	goodsOrder/src/com/action/OrdersAction.java

	eidt String abcd;