Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Signed-off-by: 陈释k8 <11301119@bjtu.edu.cn>
Signed-off-by: ycf<539513963@qq.com>
Signed-off-by: 陈释k9<11301119@bjtu.edu.cn>
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge branch 'qiyu'

Conflicts:
	BLL/Student.cs
Merge branch 'Csrr' of git@github.com:Ideal2014/Ideal.git
Merge branch 'ycf' of git@github.com:Ideal2014/Ideal.git
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>