器材管理分页实现及bug修复
Merge remote-tracking branch 're/master'