From c5f4095bee1aab097a160a739d823f5f4f35e3d2 Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Tue, 24 Nov 2020 17:29:40 +0800
Subject: [PATCH] =?UTF-8?q?GeneralFile=E7=B1=BB=E5=8C=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/x/base/core/project/x_general_assemble_control.java     | 2 +-
 .../x/base/core/project/x_organization_assemble_control.java    | 2 +-
 .../x/base/core/project/x_processplatform_assemble_surface.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 56878ba11a..bbdae33de6 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 7bd6d44e94..245eabee00 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 dad03b887b..9289e1be9b 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",
-- 
GitLab