Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

shiyj1101

2021-06-16 74be20dfb5b244bbae3387db7a1aecb9fc1a21bd

 service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportRoomSMOImpl.java

old mode 100644
new mode 100755
@@ -115,7 +115,7 @@
        //查询楼栋信息
        JSONArray cars = this.getExistsCars(pd, result);
        if (cars == null) {
            CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6);
            CellRangeAddress region = new CellRangeAddress(0, 0, 0, 4);
            sheet.addMergedRegion(region);
            return;
        }
@@ -128,7 +128,7 @@
            row.createCell(4).setCellValue("");
        }

        CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6);
        CellRangeAddress region = new CellRangeAddress(0, 0, 0, 4);
        sheet.addMergedRegion(region);
    }