Merge branch '20210204' into 20210223

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/BuildingResolverExcelService.java

@@ -146,7 +146,7 @@ public class BuildingResolverExcelService implements ResolverExcelService {
 
             log.info("开始循环为空的行上移");
             //循环为空的行上移
-            if(data.getFailTime().incrementAndGet() > 0){
+            if(data.getFailTime().get() > 0){
                 for (int rowNum = hssfSheet.getLastRowNum(); rowNum > 0 ; rowNum--) {
                     Row row = hssfSheet.getRow(rowNum);
                     if (row == null) {