显示第几教学周
Merge remote-tracking branch 'remotes/michael/master'

Conflicts:
	src/main/webapp/script/main.js
Merge pull request #59 from admq/master

修改部分bug
修改了部分小问题
Merge remote-tracking branch 'remotes/michael/master'
Merge pull request #60 from LuckyDukang/master

修改了部分小问题
修复了发布通知公告上传的问题
Merge branch 'master' of github.com:yidongnan/HUT
修改了data.sql文件    以及修改了学年的规范化
Merge remote-tracking branch 'remotes/michael/master'
Merge pull request #61 from LuckyDukang/master

修改了data.sql文件    以及修改了学年的规范化
删掉了重复数据
Merge remote-tracking branch 'remotes/michael/master'
Merge pull request #62 from LuckyDukang/master

删掉了重复数据
添加按照班级录入成绩功能  修改了一些bug