部署期间本地有更新
Merge branch 'master' of https://github.com/tjproject/TiCheck_Server

Conflicts:
	protected/runtime/application.log