From 9dfbd27fcb58cbb897a214bd70706fbdad97de6b Mon Sep 17 00:00:00 2001
From: PPPSCN <35696959@qq.com>
Date: Fri, 29 Jun 2018 16:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'karson/master'

---
 application/admin/command/Crud.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index fa0d2a17..d8256244 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -752,7 +752,6 @@ class Crud extends Command
                 'modelNamespace'          => $modelNamespace,
                 'validateNamespace'       => $validateNamespace,
                 'controllerUrl'           => $controllerUrl,
-                'controllerDir'           => $controllerDir,
                 'controllerName'          => $controllerName,
                 'controllerAssignList'    => implode("\n", $controllerAssignList),
                 'modelName'               => $modelName,