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/24f5947343209a91bb72f2be1d995a7847928238.file.actz.html.php
	public/tpls/templates_c/99f4b94be72815d91c8e383d421150d80b9d5a7f.file.act_dtl.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/faf877110be62a795340f534c0c692bc647f473c.file.rec_edit.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/065819e33f80626bdc30cb4be17a49ec08988f18.file.act_apply.html.php
	public/tpls/templates_c/409f65359b724a9e37fdf04bfeb5db6216df765e.file.vol_note.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.html.php
	public/tpls/templates_c/752cbfc027f3777f233663e911afc60372c08152.file.print_vol_time.html.php
	public/tpls/templates_c/7eb1dfe49ab8c6a3a0e890bd108136bf58dec260.file.indexv.html.php
	public/tpls/templates_c/951d89b8cce9357fa487d7d6b7094e91bd6d252f.file.note_edit.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/tpls/templates_c/faf877110be62a795340f534c0c692bc647f473c.file.rec_edit.html.php

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