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

Conflicts:
	public/tpls/templates_c/b265a370e06f0f8f0e1ef940d46cce35e7ccaf6c.file.publicity.html.php

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