(cherry picked from commit 2f8c0a2786)
2f8c0a2786
解决设备信息导入子设备报错问题
This reverts commit f7b213e3b6.
f7b213e3b6