修改了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

删掉了重复数据
导师信息简况表

Signed-off-by: allen <415522571@qq.com>
Merge remote-tracking branch 'remotes/michael/master'

Conflicts:
	database/data.sql