修改js引用
Merge remote-tracking branch 'origin/master'
添加设备入库申请功能
Merge remote-tracking branch 'origin/master'