增加分类管理实现;修改了page.js,不需要再在页面单独定义baseUrf
Merge remote-tracking branch 'origin/master'

Conflicts:
	ruclabmis-core/src/main/resources/generatorConfig.xml
	ruclabmis-web/src/main/webapp/equipment/left.jsp
	ruclabmis-web/src/main/webapp/js/page.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
增加分类管理实现;修改了page.js,不需要再在页面单独定义baseUrf