Merge remote-tracking branch 'origin/qiyu'
Signed-off-by: ycf <539513963@qq.com>
Signed-off-by: ycf <539513963@qq.com>
Signed-off-by: 0Osummer <825549402@qq.com>
修改了登录注册的验证

Signed-off-by: 0Osummer <825549402@qq.com>
Signed-off-by: 陈释荣<11301119@bjtu.edu.cn>
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge branch 'master' of git@github.com:Ideal2014/Ideal.git into qiyu
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge branch 'ycf' of git@github.com:Ideal2014/Ideal.git
Merge branch 'master' of git@github.com:Ideal2014/Ideal.git
Merge branch 'Csrr' of git@github.com:Ideal2014/Ideal.git
Merge branch 'qiyu'

Conflicts:
	WebBackEnd/Teacher/TeacherAdd.aspx.cs
	WebBackEnd/User/StudentAdd.aspx.cs
还有部分链接没有改
验证是否用户名已存在还有问题
验证还有部分没有写

Signed-off-by: 0Osummer <825549402@qq.com>
Merge branch 'summer' of git@github.com:Ideal2014/Ideal.git
Signed-off-by: 0Osummer <825549402@qq.com>
Merge branch 'summer' of git@github.com:Ideal2014/Ideal.git

Conflicts:
	WebFrontEnd/Student/StudentModifyAccount.aspx.cs
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Merge branch 'qiyu'
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>