添加普通教室选择
Merge remote-tracking branch 'remotes/remote_hut/master'

Conflicts:
	src/main/java/com/hut/action/AssistCourseAction.java
Merge remote-tracking branch 'remotes/remote_hut/master'
排课实现(1)
Merge remote-tracking branch 'remotes/remote_hut/master'
修改回来方法名assistAdvancedCourse
Merge pull request #22 from admq/master

排课功能初步可用