修改前端接入
Merge branch 'ito' of https://github.com/liqian008/geekway.git into ito

Conflicts:
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandEdit.jsp