diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java
index 56878ba11a53ec516e9a7e4ac26fa1fe519bc390..bbdae33de6c01d9b1ede17afc2afb266fddb1d3b 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java
@@ -6,7 +6,7 @@ import com.x.base.core.project.annotation.ModuleCategory;
 import com.x.base.core.project.annotation.ModuleType;
 
 @Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "公共模块", packageName = "com.x.general.assemble.control", containerEntities = {
-		"com.x.general.core.entity.area.District", "com.x.general.core.entity.file.GeneralFile" }, storageTypes = {
+		"com.x.general.core.entity.area.District", "com.x.general.core.entity.GeneralFile" }, storageTypes = {
 				StorageType.file, StorageType.general }, storeJars = { "x_general_core_entity" })
 public class x_general_assemble_control extends Deployable {
 }
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java
index 7bd6d44e940e7e71ce5961bd515bccf10006b659..245eabee007350cd18ce010b2b2fa5529041f289 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java
@@ -11,6 +11,6 @@ import com.x.base.core.project.annotation.ModuleType;
 		"com.x.organization.core.entity.Identity", "com.x.organization.core.entity.PersonAttribute",
 		"com.x.organization.core.entity.Unit", "com.x.organization.core.entity.UnitAttribute",
 		"com.x.organization.core.entity.PersonCard","com.x.organization.core.entity.PermissionSetting",
-		"com.x.organization.core.entity.UnitDuty", "com.x.general.core.entity.file.GeneralFile" },storageTypes = { StorageType.general},  storeJars = { "x_organization_core_entity" ,"x_general_core_entity"})
+		"com.x.organization.core.entity.UnitDuty", "com.x.general.core.entity.GeneralFile" },storageTypes = { StorageType.general},  storeJars = { "x_organization_core_entity" ,"x_general_core_entity"})
 public class x_organization_assemble_control extends Deployable {
 }
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java
index dad03b887b4617b7390083a4a8b1c34f6d45152b..9289e1be9b3d850748e08ba0949f2e8677a99600 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java
@@ -30,7 +30,7 @@ import com.x.base.core.project.annotation.ModuleType;
 		"com.x.processplatform.core.entity.element.Split", "com.x.processplatform.core.entity.element.QueryView",
 		"com.x.processplatform.core.entity.element.QueryStat", "com.x.processplatform.core.entity.element.Mapping",
 		"com.x.query.core.entity.Item", "com.x.cms.core.entity.element.Script",
-		"com.x.portal.core.entity.Script", "com.x.general.core.entity.file.GeneralFile" },
+		"com.x.portal.core.entity.Script", "com.x.general.core.entity.GeneralFile" },
 		storageTypes = { StorageType.processPlatform, StorageType.general}, storeJars = {
 				"x_organization_core_entity", "x_organization_core_express", "x_processplatform_core_entity",
 				"x_processplatform_core_express", "x_query_core_entity", "x_cms_core_entity", "x_portal_core_entity",