修复设备预约问题
Merge remote-tracking branch 're/master'