ito
mcs接入
mcs接入
Merge branch 'ito' of https://github.com/liqian008/geekway.git into ito

Conflicts:
	geekway-front/src/main/java/com/bruce/geekway/controller/ito/ProductController.java
修改command-material
修改command-material
Merge branch 'ito' of https://github.com/liqian008/geekway.git into ito

Conflicts:
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/geekway/GeekwayMaterialController.java
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/geekway/GeekwayUploadController.java
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandEdit.jsp
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandList.jsp
	geekway-service/src/main/java/com/bruce/geekway/dao/impl/WxCommandMaterialDaoImpl.java
	geekway-service/src/main/java/com/bruce/geekway/dao/impl/WxMaterialDaoImpl.java
修改jsp显示bug
wx增加del功能
Merge branch 'ito' of https://github.com/liqian008/geekway.git into ito

Conflicts:
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandList.jsp
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/materialList.jsp
增加材质属性
增加wx_mp_user
增加skuEdit
增加sku的图片功能
修改单图文，多图文素材设计方案
增加素材选择
修改展示内容
修改前端接入
Merge branch 'ito' of https://github.com/liqian008/geekway.git into ito

Conflicts:
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandEdit.jsp
完善多图文管理