更新：按钮生成修改
Merge branch 'master' of https://github.com/iacdingping/shanglvka

Conflicts:
	shanglvka-wap/src/main/java/com/slk/wap/controller/weixin/menu/MenuController.java