1、更新合并
1、更新下成绩类，添加了任课老师属性
1、忽略
1、忽略
1、忽略
Merge branch 'dev' of https://github.com/matrixj/student.git into dev
Merge remote-tracking branch 'origin/linyaohua' into huntercen

Conflicts:
	.classpath
Merge remote-tracking branch 'origin/canlee' into huntercen
Merge remote-tracking branch 'origin/dev' into huntercen
asdas
数据库操作类做了修改
1、添加了阻止用户直接访问jsp页面的过滤器
Merge remote-tracking branch 'origin/huntercen' into dev
Merge remote-tracking branch 'origin/canlee' into dev
s
编写了通用的主页界面
修改背景高度
1、修改了主页界面
2、优化了背景界面
123
忽略