删除不用页面，修改文件标题
Merge remote-tracking branch 're/master'
Merge remote-tracking branch 're/master'

Conflicts:
	sbgl/WebRoot/computer/computerorderConfirm.vm
修改课程预约数量不满足问题
管理员首页，前台首页
Merge remote-tracking branch 're/master'