Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2024-11-23 3011b9800d6c5bee031d87bc4e225b5b1fb52571

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

@@ -143,7 +143,7 @@
     * @return
     */
    public int getDataRowNum(){
        return headerNum+1;
        return headerNum;
    }

    /**
@@ -262,7 +262,7 @@
        List<E> dataList = new ArrayList<>();
        System.out.println("起始数据行:"+getDataRowNum());
        System.out.println("结束数据行:"+getLastDataRowNum());
        for (int i = this.getDataRowNum(); i <= this.getLastDataRowNum(); i++) {
        for (int i = this.getDataRowNum(); i < this.getLastDataRowNum(); i++) {
            E e = (E)cls.newInstance();
            int column = 0;
            Row row = this.getRow(i);