diff --git a/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
index d63293f..84f6290 100644
--- a/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
+++ b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java
@@ -622,8 +622,10 @@ public class PrimaryDataAppController {
 			experRow = setCellValueAndStyle(experRow, hbNum, experDevVo.getRemarks(), commonStyle);
 			sheet.addMergedRegion(new CellRangeAddress(experRow.getRowNum(), experRow.getRowNum(), 0, 1));
 		}
-		sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2));
-		sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1));
+		if(8 != 8 + experDevVos.size() - 1){
+			sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2));
+			sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1));
+		}
 		return sheet;
 	}
 
diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
index 20f0f0d..fe86de6 100644
--- a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
+++ b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
@@ -646,8 +646,10 @@ public class DownLoadController {
             experRow = setCellValueAndStyle(experRow, hbNum, experDevVo.getRemarks(), commonStyle);
             sheet.addMergedRegion(new CellRangeAddress(experRow.getRowNum(), experRow.getRowNum(), 0, 1));
         }
-        sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2));
-        sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1));
+        if(8 != 8 + experDevVos.size() - 1){
+            sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 2, hbNum - 2));
+            sheet.addMergedRegion(new CellRangeAddress(8, 8 + experDevVos.size() - 1, hbNum - 1, hbNum - 1));
+        }
         return sheet;
     }
 
diff --git a/src/main/resources/static/js/publicJs.js b/src/main/resources/static/js/publicJs.js
index 936a0e1..6476388 100644
--- a/src/main/resources/static/js/publicJs.js
+++ b/src/main/resources/static/js/publicJs.js
@@ -7,7 +7,7 @@ console.log(url)
 let test_url="http://192.168.0.14:11997/szgqj";
 let dev_url="http://112.27.246.86:21997/szgqj";
 let dev_url2="https://jj.jypxks.com/szgqj";
-let local_url="http://127.0.0.1:21997/szgqj";
+let local_url="http://127.0.0.1:11997/szgqj";
 let dataUrl = "http://112.27.246.86:21997/szgqj"
 
 if(url.indexOf("112.27.246.86")!=-1){