Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/99f4b94be72815d91c8e383d421150d80b9d5a7f.file.act_dtl.html.php

Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>