合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1251

@@ -14,6 +14,8 @@ use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
+use App\Models\Template\Template;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -141,7 +143,7 @@ class LyhImportTest extends Command
             $newsModel->del(['id'=>$v['id']]);
             $newsModel->del(['id'=>$v['id']]);
             $customContentModel = new CustomModuleContent();
             $customContentModel = new CustomModuleContent();
             $id = $customContentModel->addReturnId($param);
             $id = $customContentModel->addReturnId($param);
-            $route = RouteMap::setRoute($v['route'],RouteMap::SOURCE_MODULE,$id,$project_id);
+            $route = RouteMap::setRoute($param['route'],RouteMap::SOURCE_MODULE,$id,$project_id);
             $customContentModel->edit(['route'=>$route],['id'=>$id]);
             $customContentModel->edit(['route'=>$route],['id'=>$id]);
         }
         }
         return true;
         return true;