From 4e400f496260b44b324fa17bc29d7ee9b18284a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B7=A1=E5=BF=98=E4=B8=80=E5=88=87?=
 <7990497@qq.com>
Date: Mon, 27 Nov 2023 17:13:06 +0800
Subject: [PATCH] =?UTF-8?q?Finish=20Task=20#4531=20Cost:4h=C2=A0=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6=E5=90=88=E5=90=8C=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E5=8D=95=E4=BD=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/blueland/common/core/domain/BaseEntity.java | 2 --
 .../com/blueland/common/core/handler/ExcelDicHandler.java     | 4 ++--
 .../common/core/service/impl/InternationalServiceImpl.java    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/blueland/common/core/domain/BaseEntity.java b/src/main/java/com/blueland/common/core/domain/BaseEntity.java
index 9a9321e..3ff6263 100644
--- a/src/main/java/com/blueland/common/core/domain/BaseEntity.java
+++ b/src/main/java/com/blueland/common/core/domain/BaseEntity.java
@@ -43,12 +43,10 @@ public class BaseEntity {
     private Date updateTime;
 
     @Column(ignore = true)
-    @JSONField(serialize = false)
     @ApiModelProperty(value = "分页大小")
     protected int pageSize;
 
     @Column(ignore = true)
-    @JSONField(serialize = false)
     @ApiModelProperty(value = "分页页码")
     protected int pageNum;
 
diff --git a/src/main/java/com/blueland/common/core/handler/ExcelDicHandler.java b/src/main/java/com/blueland/common/core/handler/ExcelDicHandler.java
index 86989df..02e616e 100644
--- a/src/main/java/com/blueland/common/core/handler/ExcelDicHandler.java
+++ b/src/main/java/com/blueland/common/core/handler/ExcelDicHandler.java
@@ -42,7 +42,7 @@ public class ExcelDicHandler implements IExcelDictHandler {
         dictMap.put("dictValue", "前端");
         list.add(dictMap);
         dictMap = new HashMap<>();
-        dictMap.put("dictKey", "black");
+        dictMap.put("dictKey", "back");
         dictMap.put("dictValue", "后端");
         list.add(dictMap);
         return list;
@@ -72,7 +72,7 @@ public class ExcelDicHandler implements IExcelDictHandler {
             if ("前端".equals(String.valueOf(value))) {
                 return "front";
             }
-            return "black";
+            return "back";
         } else if (SysConstan.LANG.equals(dict)) {
             if ("中文".equals(String.valueOf(value))) {
                 return "zh";
diff --git a/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java b/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java
index 89f8407..b1a5878 100644
--- a/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java
+++ b/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java
@@ -241,7 +241,7 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
 
         } catch (Exception e) {
             e.printStackTrace();
-            throw new RuntimeException("导入失败");
+            throw new RuntimeException(e.getMessage());
         }
         List<International> list = BeanUtil.copyToList(importList, International.class);
         boolean flag = saveBatch(list);