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

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

Conflicts:
	public/act.php
	public/handle/act.php

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