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

Conflicts:
	public/tpls/templates_c/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/tpls/templates_c/bade9366763f2c3ef3f5c78c15ec9639ccea326d.file.login.html.php

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

Conflicts:
	public/tpls/templates_c/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/96d3fd1e009976a21de025d195eca89f4cd64a36.file.super_admin_noactlist.html.php
	public/tpls/templates_c/a23aec0c55b99587f6c5855f45f4b4de2347e8f6.file.super_admin_change_team_pwd.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/tpls/templates_c/b50b7562c6d0bda8d5967293bd62cebc8b3648b0.file.footer.html.php
	public/tpls/templates_c/bade9366763f2c3ef3f5c78c15ec9639ccea326d.file.login.html.php
	public/tpls/templates_c/ca42c2d9adf86cfe0b6f0dde3518a36e842461f6.file.super_admin_add_team.html.php
	public/tpls/templates_c/d6a328254f3c3ea1ecde6f19f08837bf57cbb730.file.super_admin.html.php
	public/tpls/templates_c/e7b1c74051c7faa1a98def30a0cb77ffc342d845.file.super_admin_actinfo.html.php

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