Merge remote-tracking branch 'origin/master'

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/AccessPlanV4ServiceImpl.java

@@ -509,6 +509,11 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{
                 HSSFCell header_row_cell_6 = detail_row.getCell(6);
                 header_row_cell_6.setCellValue(details.get(j).getContent());
             }
+            if(detail_size <= 1){
+                // 累计合并结束行号
+                row += detail_size;
+                continue;
+            }
             CellRangeAddress header_region_0 = new CellRangeAddress((short) row, (short) row + detail_size - 1, (short) 0, (short) 0);
             CellRangeAddress header_region_1 = new CellRangeAddress((short) row, (short) row + detail_size - 1, (short) 1, (short) 1);
             CellRangeAddress header_region_2 = new CellRangeAddress((short) row, (short) row + detail_size - 1, (short) 2, (short) 2);