From 7122929c15b1cd4fa700e7fc340dea593b0ea87b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 25 May 2022 12:49:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/pom.xml b/backend/pom.xml index c82afdcd40..ad48667d54 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -150,7 +150,7 @@ com.alibaba fastjson - 1.2.79 + 1.2.83 com.auth0 From 8d517f450d9a94e612ebc8f9255580a89ce6b305 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 25 May 2022 12:55:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2excel=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=97=B6=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddExcel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index fe347628f4..25d15ae70a 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -367,7 +367,7 @@ export default { } } if (this.param.editType === 0 && this.param.tableId) { - $confirm(i18n.t('dataset.repeat_datasource_msg'), () => { + $confirm(i18n.t('dataset.excel_replace_msg'), () => { this.saveExcelData(sheetFileMd5, table) }) }else {