修复个人订单
课程规则
Merge remote-tracking branch 're/master'
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
Merge remote-tracking branch 're/master'

Conflicts:
	sbgl/WebRoot/equipmentBooking.vm
Merge remote-tracking branch 're/master'

Conflicts:
	sbgl/WebRoot/js/bfa.js
Merge remote-tracking branch 're/master'
控制后退键