入学管理->查看学生成绩->重置刷新
显示第几教学周
Merge remote-tracking branch 'remotes/michael/master'

Conflicts:
	src/main/webapp/script/main.js
修改一些bug
Merge remote-tracking branch 'remotes/remote_hut/master'
xi
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
导师 老师 个人信息查看  管理员查看导师和老师信息
Merge branch 'master' of https://github.com/allenwtl/HUT

Conflicts:
	src/main/webapp/jcxx/script/drdsxx.js
Merge remote-tracking branch 'remotes/michael/master'