From eb08ace50b9855aeb08b8a7be0f66b613eb7e05c Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 25 Apr 2016 17:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Controller=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/think/Controller.php b/library/think/Controller.php
index 0f9ebc74..efc0b698 100644
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -97,14 +97,14 @@ class Controller
     /**
      * 渲染内容输出
      * @access public
-     * @param string $template 模板文件名
+     * @param string $content 模板内容
      * @param array  $vars     模板输出变量
      * @param array $config     模板参数
      * @return mixed
      */
-    public function display($template = '', $vars = [], $config = [])
+    public function display($content = '', $vars = [], $config = [])
     {
-        return $this->view->display($template, $vars, $config);
+        return $this->view->display($content, $vars, $config);
     }
 
     /**