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/065819e33f80626bdc30cb4be17a49ec08988f18.file.act_apply.html.php
	public/tpls/templates_c/230cf9487e21db83bfe175beb267a8c56700c95a.file.infov_edit.html.php
	public/tpls/templates_c/24f5947343209a91bb72f2be1d995a7847928238.file.actz.html.php
	public/tpls/templates_c/30d6f97b3c1399738e8165e4b01ab2e82cbfa326.file.rec_dtl.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.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/7eb1dfe49ab8c6a3a0e890bd108136bf58dec260.file.indexv.html.php
	public/tpls/templates_c/99f4b94be72815d91c8e383d421150d80b9d5a7f.file.act_dtl.html.php
	public/tpls/templates_c/ab062eed054cb9587393470cba91204f1022e9b4.file.notice_detail.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/d9589185483075bbc18652f970ece25b1222a8d2.file.mem.html.php
	public/tpls/templates_c/eeee522a0758d012a324ea3c3c98562ee4285189.file.news.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php
	public/tpls/templates_c/faf877110be62a795340f534c0c692bc647f473c.file.rec_edit.html.php
	public/tpls/templates_c/fcc6fe68a9e41e4d9da946fded2039d0b9e628f0.file.indext.html.php
	public/tpls/templates_c/ff5701e6c2d16695a03a7c96a4c8dff10f58032e.file.act_dtl_left.html.php
	sys/class/class.team.inc.php

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