Signed-off-by: Demonsu <245681117@qq.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/ff5701e6c2d16695a03a7c96a4c8dff10f58032e.file.act_dtl_left.html.php

Signed-off-by: Demonsu <245681117@qq.com>
答辩前的挣扎改动

Signed-off-by: Demonsu <245681117@qq.com>