修改学校地域tab,队员名单支持更多类型文档上传
修改学校地域tab,队员名单支持更多类型文档上传
Merge branch 'master' of https://github.com/blueed/DPX

Conflicts:
	Admin/Runtime/Cache/14bf7c754fc47b8bac46276ef370153d.php
	Admin/Runtime/Cache/193896acfb5a123ce2410910fea55513.php
	Admin/Runtime/Cache/20eabf8d43f497715f3e1a7ec1a2f00f.php
	Admin/Runtime/Cache/7c2434073db3944652401eab79ac2af6.php
	Admin/Runtime/Cache/d67d32c50835914bf894f36d79ff503e.php
	Home/Runtime/Cache/1cb3ad00e03a06cbfc1211a9c51cc828.php
	config.php
修改学校地域tab,队员名单支持更多类型文档上传docx,xlsx