From 92b7643bbe5cdb32009a031825fa4d374aa61b49 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 10 Jan 2024 17:01:01 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/api/vo/ResultCommon.java | 2 +- laws-single-startup/src/main/resources/i18n/messages.properties | 2 +- .../src/main/resources/i18n/messages_en.properties | 2 +- .../src/main/resources/i18n/messages_zh.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java index 26156c7a..664548e8 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java @@ -129,7 +129,7 @@ public class ResultCommon { public static final String DRAFT_NOT_EXISTS = "draft.not.exists"; /** - * 企标编号冲突，请重新生成 + * 企标编号已存在，需等待重新生成顺序号 */ public static final String EN_STANDARD_NUMBER_CONFLICT = "en.standard.number.conflict"; diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 6de2c8f5..bebf8e04 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -64,6 +64,6 @@ tag.edit.error.1=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539 please.search.to.import=\u8BF7\u8F93\u5165\u68C0\u7D22\u5185\u5BB9 task.not.exists=\u4EFB\u52A1\u4E0D\u5B58\u5728 draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728 -en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u51B2\u7A81\uFF0C\u8BF7\u91CD\u65B0\u751F\u6210 +en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index acfb9512..5f776c69 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -69,6 +69,6 @@ tag.edit.error.1=Fixed field, which cannot be modified. please.search.to.import=please search to import task.not.exists=Task not exists draft.not.exists=Draft not exists -en.standard.number.conflict=English standard number conflict +en.standard.number.conflict=standard number exists tag.add.error.2=each table can have a maximum of 50 fields. task.urging.error=Can only remind to do tasks diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index ee42d65f..d7516d92 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -69,6 +69,6 @@ tag.edit.error.1=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539 please.search.to.import=\u8BF7\u8F93\u5165\u68C0\u7D22\u5185\u5BB9 task.not.exists=\u4EFB\u52A1\u4E0D\u5B58\u5728 draft.not.exists=\u8349\u7A3F\u4E0D\u5B58\u5728 -en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u51B2\u7A81\uFF0C\u8BF7\u91CD\u65B0\u751F\u6210 +en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u9700\u7B49\u5F85\u91CD\u65B0\u751F\u6210\u987A\u5E8F\u53F7 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1