fix: 合并

app/admin/controller/Gen/Gen.php

@@ -345,13 +345,11 @@ class Gen extends BaseController
         try {
             if ($table['tplCategory'] == "web_static") {
                 $this->createAdminController($columns, $table);
-                // $this->createNewModel($columns, $table);
                 (new Model($columns, $table))->createNewModel();
                 $this->createJsWebStaticIndex($columns, $table);
                 $this->createJsApi($columns, $table);
             } else if ($table['tplCategory'] == "crud") {
                 $this->createAdminController($columns, $table);
-                // $this->createNewModel($columns, $table);
                 (new Model($columns, $table))->createNewModel();
                 $this->createJsVue($columns, $table);
                 $this->createJsAdd($columns, $table);
@@ -824,6 +822,7 @@ class Gen extends BaseController
             $className = $table['className'];
 
             if ($isSort == 1) {
+                
                 $sortTemplate = "
                 <!-- 排序 -->
                 <template #{$columnName}='scope'>
@@ -1991,7 +1990,7 @@ class Gen extends BaseController
                         \$params = \$request->param();
                         \$select = Model{$class_name}::field({$init_fields_arr_str})
                             ->order({$order_field}, $order_mode )
-                            ->select()->toArray();
+                            ->select();
                         return Model{$class_name}::exportExcel(\$select);
                     }";
             case 'export_mod':