修改
修改
修改
Signed-off-by: SabrinaWang <673458347@qq.com>
修改
Merge branch 'qiyu' of git@github.com:Ideal2014/Ideal.git into qiyu

Conflicts:
	SQLServerDAL/Feedback.cs
	WebBackEnd/Feedback/Feedback.aspx
	WebBackEnd/Feedback/Feedback.aspx.cs
修改
修改
Merge branch 'Csrr' of git@github.com:Ideal2014/Ideal.git

Conflicts:
	BLL/Teacher.cs
	IBLL/ITeacher.cs
	IDAL/ITeacher.cs
	SQLServerDAL/SQLServerDAL.csproj
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge branch 'SabrinaWang' of git@github.com:Ideal2014/Ideal.git

Conflicts:
	SQLServerDAL/SQLServerDAL.csproj
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge branch 'Csrr' of git@github.com:Ideal2014/Ideal.git
Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>