发型师 界面 调整
Merge branch 'master' of https://github.com/ShiinaMinatus/wchatplatform

解决defined 文件冲突

Conflicts:
	Config/bootstrap/defined.php
Merge branch 'master' of https://github.com/ShiinaMinatus/wchatplatform