增加封面图上传功能
Merge branch 'master' of https://github.com/liqian008/geekway.git

Conflicts:
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/GeekwayArticleController.java
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/mp/GeekwayMpCustomizeMenuController.java
	geekway-admin/src/main/webapp/WEB-INF/jsp/article/articleEdit.jsp
	geekway-service/src/main/java/com/bruce/geekway/service/impl/WxMenuService.java