设备类型和点检区域联动
Merge remote-tracking branch 'origin/master'