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

Conflicts:
	public/tpls/templates_c/065819e33f80626bdc30cb4be17a49ec08988f18.file.act_apply.html.php
	public/tpls/templates_c/2ce719227b9ae7bc28317370bb4d6b205012cc85.file.note.html.php
	public/tpls/templates_c/53b9ffc70aa720e4a23eb563822ebf67326bba0c.file.infot.html.php
	public/tpls/templates_c/951d89b8cce9357fa487d7d6b7094e91bd6d252f.file.note_edit.html.php
	public/tpls/templates_c/faf877110be62a795340f534c0c692bc647f473c.file.rec_edit.html.php

Signed-off-by: yeguangsuixing <411707420@qq.com>