增加微信菜单功能开发
Merge remote-tracking branch 'origin/master'

Conflicts:
	srcresources/server.properties