课程预约完善、课程规则删除修改完善
Merge remote-tracking branch 're/master'