添加商品功能上传（50%）
Merge branch 'master' of https://github.com/monsoon1360/passistant

Conflicts:
	passistant/src/main/java/org/jg/passistant/controller/CommController.java
	passistant/src/main/webapp/WEB-INF/jsp/commodity/forms.jsp