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 ffa6cafc..795f7683 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,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/web${subModulePath}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.web${subModuleNameDot};
 
 <% if (table.isTreeEntity){ %>
 import java.util.Map;
@@ -51,11 +51,11 @@ import com.alibaba.fastjson.JSONValidator;
 import com.jeesite.common.codec.EncodeUtils;
 <% } %>
 import com.jeesite.common.web.BaseController;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
 <% } %>
-import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service;
+import ${packageName}.${moduleName}.service${subModuleNameDot}.${ClassName}Service;
 
 /**
  * ${functionName}Controller
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 563092fe..96ba8dad 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,14 +3,14 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/dao${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.dao${subModuleNameDot};
 
 import com.jeesite.common.dao.${table.isTreeEntity?'Tree':'Crud'}Dao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}DAO接口
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 f2929e07..458552f2 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${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/entity${subModulePath}</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 09008874..9262fb79 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/mappings/${lastPackageName}${modulePath}${subModulePath}</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 9b0f12c0..0602896f 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,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/service${subModulePath}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.service${subModuleNameDot};
 
 import java.util.List;
 <% if (table.childList.~size > 0){ %>
@@ -17,8 +17,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${ClassName}Dao;
 <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
 import java.util.Map;
 import com.jeesite.common.lang.StringUtils;
@@ -32,8 +32,8 @@ import com.jeesite.common.service.ServiceException;
 import com.jeesite.modules.file.utils.FileUploadUtils;
 <% } %>
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${@StringUtils.cap(child.className)}Dao;
 <% } %>
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
 import com.jeesite.common.config.Global;
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 a39ad2bd..5ef41c42 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 66961473..fcd1b09d 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 105db071..3ac55dae 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 4e3b28bd..5550acde 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 a758b3d3..d5ebd153 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,15 +3,15 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>api</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/api${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}-client/src/main/java${packagePath}${modulePath}/api${subModulePath}</filePath>
 	<fileName>${ClassName}ServiceApi.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.api${subModuleNameDot};
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.jeesite.common.service.rest.${table.isTreeEntity?'Tree':'Crud'}ServiceRest;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}API
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 132b6ebf..d07d9749 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,15 +3,15 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>client</name>
-	<filePath>${baseDir}/${moduleName}-client/src/main/java/${packagePath}/${moduleName}/client${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}-client/src/main/java${packagePath}${modulePath}/client${subModulePath}</filePath>
 	<fileName>${ClassName}ServiceClient.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.client${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.client${subModuleNameDot};
 
 import org.springframework.cloud.openfeign.FeignClient;
 
 import com.jeesite.modules.cloud.feign.condition.ConditionalOnNotCurrentApplication;
-import ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}ServiceApi;
+import ${packageName}.${moduleName}.api${subModuleNameDot}.${ClassName}ServiceApi;
 
 /**
  * ${functionName}API
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 21470f2a..8e059ecb 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,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/java${packagePath}${modulePath}/web${subModulePath}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.web${subModuleNameDot};
 
 <% if (table.isTreeEntity){ %>
 import java.util.Map;
@@ -51,11 +51,11 @@ import com.alibaba.fastjson.JSONValidator;
 import com.jeesite.common.codec.EncodeUtils;
 <% } %>
 import com.jeesite.common.web.BaseController;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
 <% } %>
-import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service;
+import ${packageName}.${moduleName}.service${subModuleNameDot}.${ClassName}Service;
 
 import org.apache.seata.spring.annotation.GlobalTransactional;
 
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 ecc5bbb9..1d1dfb3a 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,14 +3,14 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/java${packagePath}${modulePath}/dao${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.dao${subModuleNameDot};
 
 import com.jeesite.common.dao.${table.isTreeEntity?'Tree':'Crud'}Dao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}DAO接口
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 286011a4..b179a027 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${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}-client/src/main/java${packagePath}${modulePath}/entity${subModulePath}</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 6273fb35..8a11e107 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/mappings/${lastPackageName}${modulePath}${subModulePath}</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 49d4d577..fa8fa3b1 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,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/${moduleName}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/java${packagePath}${modulePath}/service${subModulePath}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.service${subModuleNameDot};
 
 import java.util.List;
 <% if (table.childList.~size > 0){ %>
@@ -18,9 +18,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
-import ${packageName}.${moduleName}.api${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}ServiceApi;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${ClassName}Dao;
+import ${packageName}.${moduleName}.api${subModuleNameDot}.${ClassName}ServiceApi;
 <% if(toBoolean(table.optionMap['isBpmForm'])){ %>
 import java.util.Map;
 import com.jeesite.common.lang.StringUtils;
@@ -34,8 +34,8 @@ import com.jeesite.common.service.ServiceException;
 import com.jeesite.modules.file.utils.FileUploadUtils;
 <% } %>
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${@StringUtils.cap(child.className)}Dao;
 <% } %>
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
 import com.jeesite.common.config.Global;
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 3bf72277..11db3de1 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 4a9ce7e1..5bd12355 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 8f58c066..63a3ac9b 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 6cc84514..845b1b73 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}${modulePath}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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/module/bin/deploy.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
index 53830229..2eca39e9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>deploy.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
index e2ed3d66..480d3504 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/deploy.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>deploy.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
index d86f4727..54edef96 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
index 8f33e9f1..998f092c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
index 2d5900b8..41d8d5cb 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/db/erm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>erm</name>
-	<filePath>${baseDir}/${moduleCode}/db</filePath>
+	<filePath>${baseDir}/${modulePath}/db</filePath>
 	<fileName>${moduleCode}.erm</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <diagram>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
index e03805a9..56aac210 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
index fce4f31d..365b7bbd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
index 2476a20e..97675bbd 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/config/jeesite.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>jeesite</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/resources/config</filePath>
 	<fileName>jeesite-${moduleCode}.yml</fileName>
 	<content><![CDATA[
 # 温馨提示：不建议直接修改此文件，为了平台升级方便，建议将需要修改的参数值，复制到application.yml里进行覆盖该参数值。
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
index bd704c6f..a6376c89 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/db/versions.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>versions</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/resources/db/upgrade/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/resources/db/upgrade/${moduleCode}</filePath>
 	<fileName>versions</fileName>
 	<content><![CDATA[${module.currentVersion}]]>
 	</content>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
index 94362aea..cf16a48e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module/src/main/resources/static/static.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>static</name>
-	<filePath>${baseDir}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
index 7326cafb..2a907cbf 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>deploy.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
index 59db3580..abc16e80 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/deploy.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>deploy</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>deploy.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
index 18017679..0625811d 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
index 387026d1..b1b21a53 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
index 09168989..83e3a460 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
index 3311713a..18860987 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/client/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}-client/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}-client/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml
index eb9f190b..73bc1725 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
index 4aa20dbc..094d0c0b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>docker-build</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>docker-build.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
index 8ac2ba5c..af6dfd55 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker-build.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>docker-build</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>docker-build.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
index 4b2340e2..db3417ce 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/docker/Dockerfile.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>Dockerfile</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin/docker</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin/docker</filePath>
 	<fileName>Dockerfile</fileName>
 	<content><![CDATA[FROM docker.m.daocloud.io/openjdk:17
 LABEL maintainer="ThinkGem@163.com"
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
index 5633279f..ecf7f63a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>package.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
index cc64f7ae..5bbad64e 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/package.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>package.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
index 6aaa4c60..66526e30 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-tomcat</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-tomcat.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
index 4ea38171..5928b26c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-tomcat.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-tomcat</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-tomcat.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
index 267b23b2..bb49c950 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-web.bat</fileName>
 	<charset>GBK</charset>
 	<content><![CDATA[@echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
index 1d888e21..65285a28 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/bin</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/bin</filePath>
 	<fileName>run-web.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
index beafa58b..a6c9175f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/db/erm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>erm</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/db</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/db</filePath>
 	<fileName>${moduleCode}.erm</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <diagram>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
index d25681a0..7e8f5c3a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>pom</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}</filePath>
 	<fileName>pom.xml</fileName>
 	<charset></charset>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
index be5207c6..e39a3c2f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/package.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/java/com/jeesite/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
index 77e5d5b8..9285dd9f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/java/startClass.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>start-class</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/java/com/jeesite/modules</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/java/com/jeesite/modules</filePath>
 	<fileName>${@StringUtils.capCamelCase(moduleCode)}Application.java</fileName>
 	<content><![CDATA[
 /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml
index e3d81f71..e88aa505 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-elk.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>application-elk</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>application-elk.yml</fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml
index d92601d8..e2833fda 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application-prod.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>application-prod</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>application-prod.yml</fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml
index 25aeae08..c7ecb67b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/application.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>application</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>application.yml</fileName>
 	<content><![CDATA[
 #======================================#
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
index 4d5a180f..7c7bc7bc 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-elk.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>logback-spring-elk</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring-elk.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
index 5b59c9ea..acdacded 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring-prod.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>logback-spring-prod</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring-prod.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
index 41daf3bc..edf73f83 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/config/logback-spring.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>logback-spring</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/config</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/config</filePath>
 	<fileName>logback-spring.xml</fileName>
 	<content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
index d46ba518..4f3080ed 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/resources/static/static.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>static</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/resources/static/modules/${@StringUtils.replace(moduleCode, '-', '/')}</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
index de67a742..d1acceeb 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.bat.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
 	<fileName>startup.bat</fileName>
 	<content><![CDATA[chcp 65001
 @echo off
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
index 6c8d6e79..789bf7b1 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/src/main/webapp/WEB-INF/startup.sh.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>run-web</name>
-	<filePath>${baseDir}/${moduleCode}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
+	<filePath>${baseDir}/${modulePath}/${moduleCode}/src/main/webapp/WEB-INF</filePath>
 	<fileName>startup.sh</fileName>
 	<content><![CDATA[#!/bin/sh
 # /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
index e81ff207..9907801f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>README</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>README.md</fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
index 4831145d..0c0fbb3f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>api</name>
-	<filePath>${baseDir}/packages/${moduleCode}/api</filePath>
+	<filePath>${baseDir}/packages/${modulePath}/api</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
index 167ebd0e..b34fe154 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>index</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>index.ts</fileName>
 	<content><![CDATA[
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
index 7a020d29..1346afe4 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>package</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>package.json</fileName>
 	<content><![CDATA[
 {
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
index 1de6b97d..e1bc1434 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>tsconfig</name>
-	<filePath>${baseDir}/packages/${moduleCode}</filePath>
+	<filePath>${baseDir}/packages/${modulePath}</filePath>
 	<fileName>tsconfig.json</fileName>
 	<content><![CDATA[
 {
diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
index 78eb76bb..b249219b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>views</name>
-	<filePath>${baseDir}/packages/${moduleCode}/views</filePath>
+	<filePath>${baseDir}/packages/${modulePath}/views</filePath>
 	<fileName></fileName>
 	<content><![CDATA[
 
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 0e73d874..e080f5b3 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,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>controller</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/web${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/web${subModulePath}</filePath>
 	<fileName>${ClassName}Controller.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.web${subModuleNameDot};
 
 <% if (table.isTreeEntity){ %>
 import java.util.List;
@@ -36,11 +36,11 @@ import com.jeesite.modules.sys.utils.UserUtils;
 import com.jeesite.common.entity.Page;
 <% } %>
 import com.jeesite.common.web.BaseController;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
 <% } %>
-import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service;
+import ${packageName}.${moduleName}.service${subModuleNameDot}.${ClassName}Service;
 
 /**
  * ${functionName}Controller
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 3037f18a..073062f6 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,14 +3,14 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>dao</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/dao${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/dao${subModulePath}</filePath>
 	<fileName>${ClassName}Dao.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.dao${subModuleNameDot};
 
 import com.jeesite.common.dao.${table.isTreeEntity?'Tree':'Query'}Dao;
 import com.jeesite.common.mybatis.annotation.MyBatisDao;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
 
 /**
  * ${functionName}DAO接口
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 d0c527a2..fdea692c 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,10 +3,10 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>service</name>
-	<filePath>${baseDir}/src/main/java/${packagePath}/${moduleName}/service${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/java${packagePath}${modulePath}/service${subModulePath}</filePath>
 	<fileName>${ClassName}Service.java</fileName>
 	<content><![CDATA[
-package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''};
+package ${packageName}.${moduleName}.service${subModuleNameDot};
 
 import java.util.List;
 <% if (table.childList.~size > 0){ %>
@@ -16,11 +16,11 @@ import org.springframework.stereotype.Service;
 
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Query'}Service;
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${ClassName};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${ClassName}Dao;
 <% for (child in table.childList){ %>
-import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)};
-import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}Dao;
+import ${packageName}.${moduleName}.entity${subModuleNameDot}.${@StringUtils.cap(child.className)};
+import ${packageName}.${moduleName}.dao${subModuleNameDot}.${@StringUtils.cap(child.className)}Dao;
 <% } %>
 
 /**
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 188d44e6..a2c0bfa3 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 4ee8b449..d7328812 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${baseDir}/src/main/resources/views/${lastPackageName}${modulePath}${subModulePath}</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 c0d8e40d..b5d80fda 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}${isNotEmpty(subModuleName)?'/'+subModuleName:''}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/api${modulePath}${subModulePath}</filePath>
 	<fileName>${className}.ts</fileName>
 	<content><![CDATA[
 /**
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
index a19137e5..83677378 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueForm.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueForm</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>form.vue</fileName>
 	<content><![CDATA[
 <% var modalOrDrawer = @StringUtils.contains(table.tplCategory, '_modal') ? 'Modal' : 'Drawer'; %>
@@ -63,7 +63,7 @@
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
   import { Basic${modalOrDrawer}, use${modalOrDrawer}Inner } from '@jeesite/core/components/${modalOrDrawer}';
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   <%
   var userselectExists = false;
   var officeselectExists = false;
@@ -101,7 +101,7 @@
 
   const emit = defineEmits(['success', 'register']);
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage } = useMessage();
   const { meta } = unref(router.currentRoute);
   const record = ref<${ClassName}>({} as ${ClassName});
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
index bc789025..131eb208 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormChildList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormChildList</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>form${@StringUtils.cap(table.classNameSimple)}List.vue</fileName>
 	<content><![CDATA[
 <!--
@@ -26,7 +26,7 @@
   import { useI18n } from '@jeesite/core/hooks/web/useI18n';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
-  import { ${ParentClassName} } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${parentClassName}';
+  import { ${ParentClassName} } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${parentClassName}';
   <%
   var userselectExists = false;
   var officeselectExists = false;
@@ -56,7 +56,7 @@
   import { areaTreeData } from '@jeesite/core/api/sys/area';
   <% } %>
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const record = ref<${ParentClassName}>({} as ${ParentClassName});
 
   const tableColumns: BasicColumn[] = [
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
index 0ff887a2..e9019c59 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueFormRoute.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormRoute</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>formRoute.vue</fileName>
 	<content><![CDATA[
 <!--
@@ -72,7 +72,7 @@
 <% if (table.childList.~size > 0){ %>
   import { BasicTable, useTable } from '@jeesite/core/components/Table';
 <% } %>
-  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${ClassName}, ${className}Save, ${className}Form<% if(table.isTreeEntity){ %>, ${className}TreeData<% } %> } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
@@ -124,7 +124,7 @@ for(c in table.columnList){
 
   const emitter = useEmitter();
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage } = useMessage();
   const { setTitle, close } = useTabs(router);
   const record = ref<${ClassName}>({} as ${ClassName});
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
index 31aedad0..09640ac9 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueImport.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueFormImport</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>formImport.vue</fileName>
 	<content><![CDATA[
 <% if(toBoolean(table.optionMap['isImportExport'])){ %>
@@ -51,13 +51,13 @@
   import { downloadByUrl } from '@jeesite/core/utils/file/download';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicModal, useModalInner } from '@jeesite/core/components/Modal';
-  import { ${className}ImportData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}ImportData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   import { FileType } from 'ant-design-vue/es/upload/interface';
   import { AxiosProgressEvent } from 'axios';
 
   const emit = defineEmits(['success', 'register']);
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage, showMessageModal } = useMessage();
 
   const fileList = ref<FileType[]>([]);
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
index ebbbb6c6..dd6e57d2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueIndex.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueIndex</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>index.vue</fileName>
 	<content><![CDATA[
 <% if(table.isTreeEntity || isNotBlank(table.optionMap['leftTreeRightTableUrl'])){ %>
@@ -33,10 +33,10 @@
   import { useI18n } from '@jeesite/core/hooks/web/useI18n';
   import { PageWrapper } from '@jeesite/core/components/Page';
   import { BasicTree } from '@jeesite/core/components/Tree';
-  import { ${className}TreeData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}TreeData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   import ListView from './list.vue';
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const treeCodes = ref<string[]>([]);
 </script>
 <% } %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
index 8fb90deb..114a673c 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueList.xml
@@ -3,7 +3,7 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueList</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages/${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>list.vue</fileName>
 	<content><![CDATA[
 <% var modalOrDrawer = @StringUtils.contains(table.tplCategory, '_modal') ? 'Modal' : 'Drawer'; %>
@@ -111,9 +111,9 @@ if(table.isTreeEntity){
   import { router } from '@jeesite/core/router';
   import { Icon } from '@jeesite/core/components/Icon';
   import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
-  import { ${className}Delete, ${className}ListData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}Delete, ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   <% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %>
-  import { ${className}Disable, ${className}Enable } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+  import { ${className}Disable, ${className}Enable } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
   <% } %>
   <%
   var userselectExists = false;
@@ -176,7 +176,7 @@ if(table.isTreeEntity){
   const emitter = useEmitter();
   <% } %>
 
-  const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+  const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
   const { showMessage } = useMessage();
   const { meta } = unref(router.currentRoute);
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
index b72aeaac..4fc5df73 100644
--- a/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/vue/vueSelect.xml
@@ -3,12 +3,12 @@
      No deletion without permission, or be held responsible to law. -->
 <template>
 	<name>vueSelect</name>
-	<filePath>${frontDir}/packages/${moduleName}/views/${urlPrefix}</filePath>
+	<filePath>${frontDir}/packages${modulePath}/views/${urlPrefix}</filePath>
 	<fileName>select.ts</fileName>
 	<content><![CDATA[
 import { useI18n } from '@jeesite/core/hooks/web/useI18n';
 import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
-import { ${className}ListData } from '@jeesite/${moduleName}/api/${moduleName}${isNotEmpty(subModuleName)?'/'+subModuleName:''}/${className}';
+import { ${className}ListData } from '@jeesite/${moduleMinus}/api${modulePath}${subModulePath}/${className}';
 <%
 var userselectExists = false;
 var officeselectExists = false;
@@ -38,7 +38,7 @@ import { companyTreeData } from '@jeesite/core/api/sys/company';
 import { areaTreeData } from '@jeesite/core/api/sys/area';
 <% } %>
 
-const { t } = useI18n('${moduleName}${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${className}');
+const { t } = useI18n('${moduleName}${subModuleNameDot}.${className}');
 
 const modalProps = {
   title: t('${functionNameSimple}选择'),