Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -579,6 +579,7 @@ public class CollectController extends Controller {
                 for (int j = data_start_row; j <= lastRowNum; j++) {//行
                     XSSFCell cell = sheet.getRow(j).getCell(excel_column_idx);
                     Object obj = PoiUtil.getValue(cell);
+                    if (allow_blank && StrKit.isBlank(obj.toString())) continue;
                     if (column_type.equals("Integer") && !CommonUtil.isInteger(obj.toString())) {//要求整数，实际不是整数
                         PoiUtil.addComment(wb, cell, "要求是整数，实际数据类型不是整数！");
                         PoiUtil.fillColor(wb, cell, IndexedColors.YELLOW.getIndex());