优化：优化。

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/excelEntity/UmsMemberOriginExcel.java

@@ -20,15 +20,15 @@ public class UmsMemberOriginExcel extends BaseRowModel {
     @ApiModelProperty(value = "生产地名称")
     private String originName;
 
-    @ExcelProperty("生产地面积（亩）")
+    @ExcelProperty(value = "生产地面积（亩）")
     @ApiModelProperty(value = "生产地面积（亩）")
     private Double originArea;
 
-    @ExcelProperty("生产地图片")
+    @ExcelProperty(value = "生产地图片")
     @ApiModelProperty(value = "生产地图片")
     private String imgUrl;
 
-    @ExcelProperty("生产地宣传视频")
+    @ExcelProperty(value = "生产地宣传视频")
     @ApiModelProperty(value = "生产地宣传视频地址")
     private String videoUrl;
 

forest-admin/admin-server/src/test/java/com/hwrj/cloud/admin/FirstUploadForestData.java

@@ -413,8 +413,11 @@ private int i = 1;
         }
         umsCompanyService.importExcel(listAll);
 
+        if (StringUtils.isEmpty(companyId)){
+            return null;
+        }
         //导入生产地
-        importOriginExcel(file,companyName);
+        importOriginExcel(file,companyId);
 
         //导入铲平
         importBasic(file);