diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 43775fe..c950d1f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -224,8 +224,15 @@ public class ExcelUtil } else { - val = Convert.toStr(val); - } + String dateFormat = field.getAnnotation(Excel.class).dateFormat(); + if(StringUtils.isNotEmpty(dateFormat)) + { + val=DateUtils.parseDateToStr(dateFormat,(Date) val); + } + else + { + val = Convert.toStr(val); + } } } else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType)) {