Signed-off-by: huangxiongxing <420484141@qq.com>
Merge branch 'master' of ssh://git@github.com/y3shop/jmall.git

Conflicts:
	jmall-web/src/main/java/com/javasoft/common/constant/RequestUrl.java
	jmall-web/src/main/resources/spring-defult.xml
	jmall-web/src/main/webapp/WEB-INF/web.xml