公司电脑测试
Merge branch 'master' of https://github.com/shanghaiyangming/iCC

Conflicts:
	module/Application/Module.php
	module/Application/src/Application/Controller/IndexController.php
修正