From 511d76e03fa7f85f707ee9306ac0bba0177656d8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 27 Jun 2025 17:18:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E7=89=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/modules/gen/crud/controller.xml    | 2 +-
 .../core/src/main/resources/templates/modules/gen/crud/dao.xml  | 2 +-
 .../src/main/resources/templates/modules/gen/crud/entity.xml    | 2 +-
 .../src/main/resources/templates/modules/gen/crud/mapper.xml    | 2 +-
 .../src/main/resources/templates/modules/gen/crud/service.xml   | 2 +-
 .../src/main/resources/templates/modules/gen/crud/viewForm.xml  | 2 +-
 .../src/main/resources/templates/modules/gen/crud/viewIndex.xml | 2 +-
 .../src/main/resources/templates/modules/gen/crud/viewList.xml  | 2 +-
 .../main/resources/templates/modules/gen/crud/viewSelect.xml    | 2 +-
 .../src/main/resources/templates/modules/gen/crud_cloud/api.xml | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/client.xml  | 2 +-
 .../resources/templates/modules/gen/crud_cloud/controller.xml   | 2 +-
 .../src/main/resources/templates/modules/gen/crud_cloud/dao.xml | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/entity.xml  | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/mapper.xml  | 2 +-
 .../main/resources/templates/modules/gen/crud_cloud/service.xml | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewForm.xml     | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewIndex.xml    | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewList.xml     | 2 +-
 .../resources/templates/modules/gen/crud_cloud/viewSelect.xml   | 2 +-
 .../main/resources/templates/modules/gen/query/controller.xml   | 2 +-
 .../core/src/main/resources/templates/modules/gen/query/dao.xml | 2 +-
 .../src/main/resources/templates/modules/gen/query/service.xml  | 2 +-
 .../src/main/resources/templates/modules/gen/query/viewForm.xml | 2 +-
 .../src/main/resources/templates/modules/gen/query/viewList.xml | 2 +-
 .../src/main/resources/templates/modules/gen/vue/vueApi.xml     | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
index f6bd1303..ffa6cafc 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
index b318b954..563092fe 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/dao.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
index 2b7348bd..f2929e07 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>entity</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/entity/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/entity${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml b/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
index 2961fdac..09008874 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/mapper.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>mapper</name>
-	<filePath>${baseDir}/src/main/resources/mappings/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/mappings/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.xml</fileName>
 	<content><![CDATA[
 <?xml version="1.0" encoding="UTF-8" ?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
index b1e87204..9b0f12c0 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
index 0d1ea75d..a39ad2bd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
index 9aacd215..66961473 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewIndex</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
index 34bcc2b2..105db071 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewList.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
index a22bcc85..4e3b28bd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewSelect.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewSelect</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
index 954b2f2b..a758b3d3 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/api.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>api</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/api/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/api${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}ServiceApi.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
index a4d28030..132b6ebf 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/client.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>client</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/client/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/client${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}ServiceClient.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.client${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
index 82cd6d07..21470f2a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/web/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
index 7d26c202..ecc5bbb9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/dao.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/dao/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
index e809aff1..286011a4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>entity</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/entity/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/entity${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
index 6f99968a..6273fb35 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/mapper.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>mapper</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/mappings/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/mappings/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.xml</fileName>
 	<content><![CDATA[
 <?xml version="1.0" encoding="UTF-8" ?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
index fdfa4da3..49d4d577 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/service/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
index 9712c399..3bf72277 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewForm.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
index a0481252..4a9ce7e1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewIndex</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Index.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewIndex.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
index dd7f9b47..8f58c066 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewList.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
index 0de4bfae..6cc84514 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/viewSelect.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewSelect</name>
-	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/${moduleName}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Select.html</fileName>
 	<content><![CDATA[
 <% include('/templates/modules/gen/view/viewSelect.html'){} %>]]>
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
index 83069499..0e73d874 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/dao.xml b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
index 5b9f1b04..3037f18a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/dao.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/service.xml b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
index 3d4c804f..d0c527a2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/service.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/service.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
 package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
index 5e256af6..188d44e6 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewForm</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}Form.html</fileName>
 	<content><![CDATA[
 <%
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
index ff1abef6..4ee8b449 100644
--- a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>viewList</name>
-	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}/${subModuleName}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}List.html</fileName>
 	<content><![CDATA[
 \<% layout('/layouts/default.html', {title: '${functionNameSimple}查询', libs: ['dataGrid']}){ %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
index b867ffdf..c0d8e40d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueApi.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueApi</name>
-	<filePath>${frontDir}/packages/${moduleName}/api/${moduleName}/${subModuleName}</filePath>
+	<filePath>${frontDir}/packages/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
 	<fileName>${className}.ts</fileName>
 	<content><![CDATA[
 /**