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 list = BeanUtil.copyToList(importList, International.class); boolean flag = saveBatch(list);