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

Conflicts:
	inspectManagement/inspectManagement-business/inspectManagement-business-device/src/main/java/org/whut/inspectManagement/business/device/mapper/InspectTagMapper.java