Signed-off-by: Demonsu <245681117@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/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/24f5947343209a91bb72f2be1d995a7847928238.file.actz.html.php
	public/tpls/templates_c/2ce719227b9ae7bc28317370bb4d6b205012cc85.file.note.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.html.php
	public/tpls/templates_c/53b9ffc70aa720e4a23eb563822ebf67326bba0c.file.infot.html.php
	public/tpls/templates_c/557724488c0d1472f55b9b370819058ffefc6297.file.notice.html.php
	public/tpls/templates_c/736731c7b6cce9669a5cc863b3b3c403acd97287.file.actz_apply.html.php
	public/tpls/templates_c/73bf2702b43c814ae6c0d9d1857afb4051b4492f.file.week_act_list.html.php
	public/tpls/templates_c/951d89b8cce9357fa487d7d6b7094e91bd6d252f.file.note_edit.html.php
	public/tpls/templates_c/96d3fd1e009976a21de025d195eca89f4cd64a36.file.super_admin_noactlist.html.php
	public/tpls/templates_c/98ac2491da6aa96dd5b95ddfd79f9643e04a48d2.file.act_handle.html.php
	public/tpls/templates_c/99f4b94be72815d91c8e383d421150d80b9d5a7f.file.act_dtl.html.php
	public/tpls/templates_c/a7916e79428643b39e99c1493974ee1c008cebce.file.team_list.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/tpls/templates_c/accf2e2e29956097b93510a9379feabf374c8d48.file.act_edit.html.php
	public/tpls/templates_c/ae501245acb6019fd59ecfaf5dc2aa117dc89e3a.file.zonet.html.php
	public/tpls/templates_c/b50b7562c6d0bda8d5967293bd62cebc8b3648b0.file.footer.html.php
	public/tpls/templates_c/bade9366763f2c3ef3f5c78c15ec9639ccea326d.file.login.html.php
	public/tpls/templates_c/c61b8aa861bec3a0d37d11fe76279c8a427604bb.file.super_admin_actlist.html.php
	public/tpls/templates_c/d6a328254f3c3ea1ecde6f19f08837bf57cbb730.file.super_admin.html.php
	public/tpls/templates_c/ea073ad2e18cbf1c21214b400bb081c5baf749d0.file.act_handle_none.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php
	public/tpls/templates_c/fcc6fe68a9e41e4d9da946fded2039d0b9e628f0.file.indext.html.php

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