设备组添加问题
Merge remote-tracking branch 're/master'