diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 309844844d..4644b5a062 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -69,7 +69,7 @@ spring:
         #工作流服务
         - id: epmet-activiti-server
           uri: @gateway.routes.epmet-activiti-server.uri@
-          order: 5
+          order: 6
           predicates:
             - Path=${server.servlet.context-path}/activiti/**
           filters:
@@ -77,7 +77,7 @@ spring:
         #定时任务服务
         - id: epmet-job-server
           uri: @gateway.routes.epmet-job-server.uri@
-          order: 6
+          order: 7
           predicates:
             - Path=${server.servlet.context-path}/job/**
           filters:
@@ -85,7 +85,7 @@ spring:
         #用户服务
         - id: epmet-user-server
           uri: @gateway.routes.epmet-user-server.uri@
-          order: 7
+          order: 8
           predicates:
             - Path=${server.servlet.context-path}/epmetuser/**
           filters:
@@ -93,7 +93,7 @@ spring:
         #demo流服务
         - id: epmet-demo-server
           uri: @gateway.routes.epmet-demo-server.uri@
-          order: 8
+          order: 9
           predicates:
             - Path=${server.servlet.context-path}/demo/**
           filters:
@@ -101,7 +101,7 @@ spring:
         #运营端客户定制化服务
         - id: oper-customize-server
           uri: @gateway.routes.oper-customize-server.uri@
-          order: 9
+          order: 10
           predicates:
             - Path=${server.servlet.context-path}/oper/customize/**
           filters:
@@ -109,7 +109,7 @@ spring:
         #运营端客户管理
         - id: oper-crm-server
           uri: @gateway.routes.oper-crm-server.uri@
-          order: 9
+          order: 11
           predicates:
             - Path=${server.servlet.context-path}/oper/crm/**
           filters:
@@ -117,7 +117,7 @@ spring:
         #居民端陌生人导览
         - id: resi-guide-server
           uri: @gateway.routes.resi-guide-server.uri@
-          order: 10
+          order: 12
           predicates:
             - Path=${server.servlet.context-path}/resi/guide/**
           filters:
@@ -125,7 +125,7 @@ spring:
         #政府端组织管理
         - id: gov-org-server
           uri: @gateway.routes.gov-org-server.uri@
-          order: 10
+          order: 13
           predicates:
             - Path=${server.servlet.context-path}/gov/org/**
           filters:
diff --git a/gov-org/gov-org-client/pom.xml b/epmet-module/gov-org/gov-org-client/pom.xml
similarity index 100%
rename from gov-org/gov-org-client/pom.xml
rename to epmet-module/gov-org/gov-org-client/pom.xml
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java
diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java
similarity index 100%
rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java
rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java
diff --git a/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
similarity index 98%
rename from gov-org/gov-org-server/pom.xml
rename to epmet-module/gov-org/gov-org-server/pom.xml
index 4efa0331da..d750db2d37 100644
--- a/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -82,7 +82,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <server.port>8087</server.port>
+                <server.port>8092</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
 
                 <!-- 数据库配置-->
@@ -112,7 +112,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>
-                <server.port>8087</server.port>
+                <server.port>8092</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
 
                 <!-- 数据库配置-->
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java
similarity index 100%
rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java
rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java
diff --git a/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/bootstrap.yml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
diff --git a/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/logback-spring.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml
diff --git a/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml
similarity index 100%
rename from gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml
rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml
diff --git a/gov-org/pom.xml b/epmet-module/gov-org/pom.xml
similarity index 93%
rename from gov-org/pom.xml
rename to epmet-module/gov-org/pom.xml
index 55049442f5..0ef2ad2df6 100644
--- a/gov-org/pom.xml
+++ b/epmet-module/gov-org/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>com.epmet</groupId>
-        <artifactId>epmet-cloud</artifactId>
+        <artifactId>epmet-module</artifactId>
         <version>2.0.0</version>
     </parent>
 
diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml
index 5ab568cb98..571b2fed2c 100644
--- a/epmet-module/pom.xml
+++ b/epmet-module/pom.xml
@@ -18,11 +18,11 @@
 		<module>epmet-job</module>
 		<module>epmet-message</module>
 		<module>epmet-activiti</module>
-		<module>epmet-api</module>
 		<module>epmet-demo</module>
         <module>oper-customize</module>
 		<module>oper-crm</module>
 		<module>resi-guide</module>
+		<module>gov-org</module>
     </modules>
 
 </project>