修改生成代码

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -2,12 +2,16 @@
 using Infrastructure.Extensions;
 using Infrastructure.Helper;
 using Infrastructure.Model;
+
 using JinianNet.JNTemplate;
+
 using SqlSugar;
+
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+
 using ZR.CodeGenerator.Model;
 using ZR.Model.System.Generate;
 
@@ -113,8 +117,10 @@ namespace ZR.CodeGenerator
                 BaseNamespace = genTable.BaseNameSpace,
                 SubNamespace = genTable.ModuleName.FirstUpperCase()
             };
-            _option.DtosNamespace = _option.BaseNamespace + "Model";
+            _option.DtosNamespace = !string.IsNullOrEmpty(genTable.ModelNameSpace)
-            _option.ModelsNamespace = _option.BaseNamespace + "Model";
+                ? genTable.ModelNameSpace : (_option.BaseNamespace);
+            _option.DtosNamespace += "Model";
+            _option.ModelsNamespace = _option.DtosNamespace;
             _option.RepositoriesNamespace = _option.BaseNamespace + "Repository";
             //_option.IRepositoriesNamespace = _option.BaseNamespace + "Repository";
             _option.IServicsNamespace = _option.BaseNamespace + "Service";
@@ -446,6 +452,7 @@ namespace ZR.CodeGenerator
             {
                 DbName = dto.DbName,
                 BaseNameSpace = "ZR.",//导入默认命名空间前缀
+                ModelNameSpace = "", // 默认为空，使用 BaseNameSpace + "Model"
                 ModuleName = dto.CodeGen.ModuleName,//导入默认模块名
                 ClassName = className,
                 BusinessName = className,

ZR.Model/System/Model/Dto/GenTableDto.cs

@@ -12,6 +12,7 @@ namespace ZR.Model.System.Dto
         public string ClassName { get; set; }
         public string TplCategory { get; set; }
         public string BaseNameSpace { get; set; }
+        public string ModelNameSpace { get; set; }
         public string ModuleName { get; set; }
         public string BusinessName { get; set; }
         public string FunctionName { get; set; }

ZR.Model/System/Model/Generate/GenTable.cs

@@ -52,6 +52,11 @@
         [SugarColumn(Length = 100)]
         public string BaseNameSpace { get; set; }
         /// <summary>
+        /// 生成实体命名空间前缀
+        /// </summary>
+        [SugarColumn(Length = 100)]
+        public string ModelNameSpace { get; set; }
+        /// <summary>
         /// 生成模块名
         /// </summary>
         [SugarColumn(Length = 50)]

ZR.Vue/src/views/tool/gen/genInfoForm.vue

@@ -39,6 +39,21 @@
           <el-input v-model="info.baseNameSpace" />
         </el-form-item>
       </el-col>
+      <el-col :lg="12">
+        <el-form-item prop="modelNameSpace">
+          <template #label>
+            生成实体命名空间前缀
+            <span>
+              <el-tooltip content="用于实体类(Model)和DTO类的命名空间，为空则使用'生成命名空间前缀+Model'，比如 ZR.Entity." placement="top">
+                <el-icon>
+                  <question-filled />
+                </el-icon>
+              </el-tooltip>
+            </span>
+          </template>
+          <el-input v-model="info.modelNameSpace" placeholder="留空则使用命名空间前缀+Model" />
+        </el-form-item>
+      </el-col>
       <el-col :lg="12">
         <el-form-item prop="moduleName">
           <template #label>