From cfcd69976828f97ecddd8af96e68ec3b2345b118 Mon Sep 17 00:00:00 2001 From: "zijia.cj" Date: Wed, 3 Jul 2024 11:55:34 +0800 Subject: [PATCH] merge conflict --- .../src/main/resources/i18n/BusinessMessages_zh_CN.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/odc-core/src/main/resources/i18n/BusinessMessages_zh_CN.properties b/server/odc-core/src/main/resources/i18n/BusinessMessages_zh_CN.properties index a4078edcda..db66ac8d11 100644 --- a/server/odc-core/src/main/resources/i18n/BusinessMessages_zh_CN.properties +++ b/server/odc-core/src/main/resources/i18n/BusinessMessages_zh_CN.properties @@ -831,3 +831,6 @@ com.oceanbase.odc.PartitionPlanVariableKey.INTERVAL=间隔 com.oceanbase.odc.PartitionPlanVariableKey.LAST_PARTITION_VALUE=最后一个分区规则对应位置表达式的值 com.oceanbase.odc.partitionplan.TimeDataType=时间类型 com.oceanbase.odc.partitionplan.NumberDataType=数字类型 + +# MockData Task Message +com.oceanbase.odc.MockData.null.message=未能获取到{0}，任务还未开始执行或者已完成