修改
嘻嘻嘻
Merge branch 'master' of https://github.com/Bonde2014/WebSite.git

Conflicts:
	src/main/webapp/pages/index.jsp
	src/main/webapp/pages/supply.jsp
	src/main/webapp/pages/supplyCenter.jsp
	src/main/webapp/pages/supplymanage.jsp
	src/main/webapp/scripts/supply.js