From 49c899acc59ee5b77bd039b6f020d7861b6273bf Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 12 May 2016 08:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20error=E5=92=8Csuccess?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E5=8F=82=E6=95=B0=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=20=E5=92=8C=E5=8E=9F=E6=9D=A5=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/traits/controller/Jump.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/traits/controller/Jump.php b/library/traits/controller/Jump.php
index cf54966e..39f5b761 100644
--- a/library/traits/controller/Jump.php
+++ b/library/traits/controller/Jump.php
@@ -24,12 +24,12 @@ trait Jump
      * 操作成功跳转的快捷方法
      * @access public
      * @param mixed $msg 提示信息
-     * @param mixed $data 返回的数据
      * @param string $url 跳转的URL地址
+     * @param mixed $data 返回的数据
      * @param integer $wait 跳转等待时间
-     * @return mixed
+     * @return void
      */
-    public static function success($msg = '', $data = '', $url = null, $wait = 3)
+    public static function success($msg = '', $url = null, $data = '', $wait = 3)
     {
         $code = 1;
         if (is_numeric($msg)) {
@@ -57,12 +57,12 @@ trait Jump
      * 操作错误跳转的快捷方法
      * @access public
      * @param mixed $msg 提示信息
-     * @param mixed $data 返回的数据
      * @param string $url 跳转的URL地址
+     * @param mixed $data 返回的数据
      * @param integer $wait 跳转等待时间
-     * @return mixed
+     * @return void
      */
-    public static function error($msg = '', $data = '', $url = null, $wait = 3)
+    public static function error($msg = '', $url = null, $data = '', $wait = 3)
     {
         $code = 0;
         if (is_numeric($msg)) {