设备管理
Merge remote-tracking branch 'origin/master'

Conflicts:
	inspectManagement/inspectManagement-business/pom.xml
	inspectManagement/inspectManagementWeb/pom.xml
	inspectManagement/inspectManagementWeb/src/main/webapp/js/config.js