设备类型图标对应，列表排序对应
Merge remote-tracking branch 'origin/developer' into developer