From c9f7314cd0e02201940a7800e5668bb4bbd932be Mon Sep 17 00:00:00 2001
From: 孤舟烟雨 <494979+gzyy@user.noreply.gitee.com>
Date: 星期五, 13 八月 2021 10:03:46 +0800
Subject: [PATCH] !77 update 对象存储配置 重构到数据库 动态配置 * 增加对象存储配置sql * 修改对象存储配置 * Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev * 增加对象存储配置 * 增加对象存储配置
---
ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
index 6049b1e..58560d0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java
@@ -9,7 +9,7 @@
import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field;
@@ -39,9 +39,9 @@
String label = cellData.getStringValue();
String value;
if (StringUtils.isBlank(type)) {
- value = ExcelUtils.reverseByExp(label, anno.readConverterExp(), anno.separator());
+ value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
} else {
- value = ExcelUtils.reverseDictByExp(label, type, anno.separator());
+ value = ExcelUtil.reverseDictByExp(label, type, anno.separator());
}
return Convert.convert(contentProperty.getField().getType(), value);
}
@@ -56,9 +56,9 @@
String value = Convert.toStr(object);
String label;
if (StringUtils.isBlank(type)) {
- label = ExcelUtils.convertByExp(value, anno.readConverterExp(), anno.separator());
+ label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
} else {
- label = ExcelUtils.convertDictByExp(value, type, anno.separator());
+ label = ExcelUtil.convertDictByExp(value, type, anno.separator());
}
return new CellData<>(label);
}
--
Gitblit v1.9.3