修改了部分
Merge branch 'master' of https://github.com/huangtao800/comparePrice.git

Conflicts:
	comparePrice/src/struts.xml