From d01e81295e8cf72521c456c29eaccfb378654e23 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Wed, 26 Apr 2023 09:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E7=9C=8B=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/system/SystemCrudServices.php | 1 +
 crmeb/crmeb/services/crud/Make.php               | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php
index 888792843..fbd28a596 100644
--- a/crmeb/app/services/system/SystemCrudServices.php
+++ b/crmeb/app/services/system/SystemCrudServices.php
@@ -843,6 +843,7 @@ class SystemCrudServices extends BaseServices
         $dao = app()->make(Dao::class);
         $dao->setFilePathName($filePath['dao'] ?? '')->setbasePath($basePath)->handle($tableName, [
             'usePath' => $model->getUsePath(),
+            'modelName' => $options['modelName'] ?? '',
         ]);
         //生成service
         $service = app()->make(Service::class);
diff --git a/crmeb/crmeb/services/crud/Make.php b/crmeb/crmeb/services/crud/Make.php
index d1380fe76..2156caa26 100644
--- a/crmeb/crmeb/services/crud/Make.php
+++ b/crmeb/crmeb/services/crud/Make.php
@@ -238,6 +238,9 @@ abstract class Make
         if (isset($this->value['use-php']) && !empty($options['usePath'])) {
             $this->value['use-php'] = "use " . str_replace('/', '\\', $options['usePath']) . ";\n";
         }
+        if (isset($this->value['modelName']) && !$this->value['modelName'] && !empty($options['modelName'])) {
+            $this->value['modelName'] = $options['modelName'];
+        }
 
         $contentStr = str_replace($this->var, $this->value, $content);
         $filePath = $this->getFilePathName($path, $this->value['nameCamel']);