Merge remote-tracking branch 'origin/master'

doum

2026-01-29 77eaae1a96b2c6a0a23bafbacf39806acd1980b6

 server/services/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java

@@ -4,6 +4,7 @@
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFPictureData;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +43,7 @@
     * 标题行号
     */
    private CellType changeType;

    private Map<String, XSSFPictureData> pictureList;
    /**
     * 构造函数
     * @param--path 导入文件，读取第一个工作表
@@ -161,6 +162,7 @@
        this.sheet = this.wb.getSheetAt(sheetIndex);
        this.headerNum = headerNum;
        this.changeType = cellType;
        this.pictureList = ExcelPictureUtil.getExcelPictures(in);
        log.debug("Initialize success.");
    }

@@ -228,6 +230,9 @@
        }
        return val;
    }
    public Map<String,XSSFPictureData> getExcelPictures(){
        return this.pictureList;
    }

    /**
     * 获取导入数据列表