Merge branch 'master' of https://github.com/Ideal2014/Ideal.git into ycf
Merge branch 'master' of https://github.com/Ideal2014/Ideal.git into ycf
Signed-off-by: ycf <539513963@qq.com>
Signed-off-by: 翟丽娜 <1031686704@qq.com>
Signed-off-by: 翟丽娜 <1031686704@qq.com>
Merge branch 'ycf' of git@github.com:Ideal2014/Ideal.git

Conflicts:
	WebFrontEnd/Purchase/AccountPurchase.aspx
Merge branch 'zln' of git@github.com:Ideal2014/Ideal.git
Signed-off-by: ycf <539513963@qq.com>
Merge branch 'ycf' of git@github.com:Ideal2014/Ideal.git
Signed-off-by: 齐宇 <11301127@bjtu.edu.cn>