应用反馈修改
日志管理部分提交
Merge branch 'master' of https://github.com/ltteam/qc

Conflicts:
	app/config/permissions.php