Merge branch 'master' of https://github.com/iacdingping/shanglvka

Conflicts:
	shanglvka-wap/src/main/java/com/slk/wap/controller/user/WelcomeController.java
	shanglvka-wap/src/main/resources/mappings/mysql/mp/KeywordMapper.xml
	shanglvka-wap/src/main/webapp/WEB-INF/pages/index.jsp
	shanglvka-wap/src/test/java/com/slk/weixin/WeixinTest.java
mapper修改