|
@@ -699,6 +699,11 @@ public class ExcelUtil<T>
|
|
subList = getListCellValue(vo);
|
|
subList = getListCellValue(vo);
|
|
subMergedLastRowNum = subMergedLastRowNum + subList.size();
|
|
subMergedLastRowNum = subMergedLastRowNum + subList.size();
|
|
}
|
|
}
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ subMergedFirstRowNum++;
|
|
|
|
+ subMergedLastRowNum++;
|
|
|
|
+ }
|
|
|
|
|
|
int column = 0;
|
|
int column = 0;
|
|
for (Object[] os : fields)
|
|
for (Object[] os : fields)
|