Merge branch 'cherry-pick-cc8cac1b' into 'master'

hotfix-okr转为custom

See merge request o2oa/o2oa!1794

o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_assemble_control.java

@@ -1,23 +0,0 @@
-package com.x.base.core.project;
-
-import com.x.base.core.entity.StorageType;
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-
-@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "OKR", packageName = "com.x.okr.assemble.control", containerEntities = {
-		"com.x.okr.entity.OkrAttachmentFileInfo", "com.x.okr.entity.OkrCenterWorkInfo",
-		"com.x.okr.entity.OkrConfigSecretary", "com.x.okr.entity.OkrConfigSystem",
-		"com.x.okr.entity.OkrConfigWorkLevel", "com.x.okr.entity.OkrConfigWorkType", "com.x.okr.entity.OkrTask",
-		"com.x.okr.entity.OkrTaskHandled", "com.x.okr.entity.OkrWorkAuthorizeRecord",
-		"com.x.okr.entity.OkrWorkBaseInfo", "com.x.okr.entity.OkrWorkDetailInfo", "com.x.okr.entity.OkrWorkDynamics",
-		"com.x.okr.entity.OkrWorkPerson", "com.x.okr.entity.OkrWorkReportBaseInfo",
-		"com.x.okr.entity.OkrWorkReportDetailInfo", "com.x.okr.entity.OkrWorkReportPersonLink",
-		"com.x.okr.entity.OkrWorkReportProcessLog", "com.x.okr.entity.OkrWorkChat",
-		"com.x.okr.entity.OkrStatisticReportContent", "com.x.okr.entity.OkrStatisticReportStatus",
-		"com.x.okr.entity.OkrUserInfo", "com.x.okr.entity.OkrErrorSystemIdentityInfo",
-		"com.x.okr.entity.OkrErrorIdentityRecords",
-		"com.x.okr.entity.OkrWorkAppraiseInfo" }, storageTypes = { StorageType.okr }, storeJars = {
-				"x_organization_core_entity", "x_organization_core_express", "x_okr_core_entity" })
-public class x_okr_assemble_control extends Deployable {
-}

o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_core_entity.java

@@ -1,10 +0,0 @@
-package com.x.base.core.project;
-
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-
-@Module(type = ModuleType.ENTITY, category = ModuleCategory.OFFICIAL, name = "OKR实体类", packageName = "com.x.okr.core.entity")
-public class x_okr_core_entity extends Compilable {
-
-}

o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java

@@ -50,7 +50,6 @@ import com.x.base.core.project.x_hotpic_assemble_control;
 import com.x.base.core.project.x_meeting_assemble_control;
 import com.x.base.core.project.x_message_assemble_communicate;
 import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_okr_assemble_control;
 import com.x.base.core.project.x_organization_assemble_authentication;
 import com.x.base.core.project.x_organization_assemble_control;
 import com.x.base.core.project.x_organization_assemble_express;
@@ -102,7 +101,7 @@ public class ApplicationServerTools extends JettySeverTools {
 			x_portal_assemble_surface.class.getName(), x_attendance_assemble_control.class.getName(),
 			x_bbs_assemble_control.class.getName(), x_file_assemble_control.class.getName(),
 			x_meeting_assemble_control.class.getName(), x_mind_assemble_control.class.getName(),
-			x_okr_assemble_control.class.getName(), x_hotpic_assemble_control.class.getName(),
+			x_hotpic_assemble_control.class.getName(),
 			x_query_service_processing.class.getName(), x_query_assemble_designer.class.getName(),
 			x_query_assemble_surface.class.getName());