编号修改，设备配置查询
Merge remote-tracking branch 'origin/master'