merge conflict

oceanbase · Jul 3, 2024 · cfcd699 · cfcd699
1 parent 2ed3db4
commit cfcd699
Showing 1 changed file with 3 additions and 0 deletions.
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
@@ -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}，任务还未开始执行或者已完成