From 439d8970385eeb8cc16a60ab18f0fb88a8a14d0a Mon Sep 17 00:00:00 2001
From: JaguarJack <82664165@qq.com>
Date: Thu, 14 Mar 2024 12:17:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DLaravel=E4=B8=A2=E5=BC=83?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/Develop/Models/Schemas.php                | 13 ++++++-------
 modules/Develop/Support/Generate/Create/Model.php |  3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/Develop/Models/Schemas.php b/modules/Develop/Models/Schemas.php
index a7b7fbc..92c0e8b 100644
--- a/modules/Develop/Models/Schemas.php
+++ b/modules/Develop/Models/Schemas.php
@@ -92,14 +92,13 @@ class Schemas extends CatchModel
 
         $columns = [];
 
-        foreach (getTableColumns($schema->name) as $columnString) {
-            $column = DB::connection()->getDoctrineColumn(DB::connection()->getTablePrefix().$schema->name, $columnString);
+        foreach (\Illuminate\Support\Facades\Schema::getColumns($schema->name) as $column) {
             $columns[] = [
-                'name' => $column->getName(),
-                'type' => $column->getType()->getName(),
-                'nullable' => ! $column->getNotnull(),
-                'default' => $column->getDefault(),
-                'comment' => $column->getComment()
+                'name' => $column['name'],
+                'type' => $column['type_name'],
+                'nullable' => $column['nullable'],
+                'default' => $column['default'],
+                'comment' => $column['comment'],
             ];
         }
 
diff --git a/modules/Develop/Support/Generate/Create/Model.php b/modules/Develop/Support/Generate/Create/Model.php
index 2164782..9a5cd6a 100644
--- a/modules/Develop/Support/Generate/Create/Model.php
+++ b/modules/Develop/Support/Generate/Create/Model.php
@@ -130,6 +130,7 @@ use Catch\Traits\DB\BaseOperate;
 use Catch\Traits\DB\ScopeTrait;
 use Catch\Traits\DB\Trans;
 use Illuminate\Database\Eloquent\Model;
+use Catch\Traits\DB\WithAttributes;
 Text;
         } else {
             return <<<Text
@@ -145,7 +146,7 @@ Text;
      */
     protected function getTraits(): string
     {
-        return $this->softDelete ? '' : 'use BaseOperate, Trans, ScopeTrait;';
+        return $this->softDelete ? '' : 'use WithAttributes, BaseOperate, Trans, ScopeTrait;';
     }
 
     /**