bug修复
Merge remote-tracking branch 're/master'
修复获取全部器材错误
添加器材可以选择“未知型号”