修改 首页自适应  找回密码-背景
Merge branch 'master' of https://github.com/antme/x-e-commerce

Conflicts:
	ecommerce/ecservice/src/main/webapp/resources/js/user/login.js