Merge branch 'energy-manage-shiyue'

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/WindFieldExceVo.java

@@ -8,10 +8,17 @@ import lombok.Data;
  */
 @Data
 public class WindFieldExceVo {
+
+
+    /**
+     * 客户内部编号（远景内部风场编号）
+     */
+    @ExcelProperty(value = "内部风场id", index = 0)
+    private String fieldId;
     /**
      * 风场名称
      */
-    @ExcelProperty(value = "风场名称", index = 0)
+    @ExcelProperty(value = "风场名称", index = 1)
     private String fieldName;
 
     /**
@@ -21,7 +28,7 @@ public class WindFieldExceVo {
     /**
      * 省
      */
-    @ExcelProperty(value = "省", index = 1)
+    @ExcelProperty(value = "省", index = 2)
     private String provinceName;
 
     /**
@@ -31,34 +38,34 @@ public class WindFieldExceVo {
     /**
      * 市
      */
-    @ExcelProperty(value = "市", index = 2)
+    @ExcelProperty(value = "市", index = 3)
     private String cityName;
 
     /**
      * 区号
      */
-    @ExcelProperty(value = "区号", index = 3)
+    @ExcelProperty(value = "区号", index = 4)
     private String areaCode;
 
     /**
      * 经度
      */
-    @ExcelProperty(value = "经度", index = 4)
+    @ExcelProperty(value = "经度", index = 5)
     private Double longitude;
     /**
      * 纬度
      */
-    @ExcelProperty(value = "纬度", index = 5)
+    @ExcelProperty(value = "纬度", index = 6)
     private Double latitude;
     /**
      * 空气密度
      */
-    @ExcelProperty(value = "空气密度", index = 6)
+    @ExcelProperty(value = "空气密度", index = 7)
     private Double density;
     /**
      * 海拔高度
      */
-    @ExcelProperty(value = "海拔高度", index = 7)
+    @ExcelProperty(value = "海拔高度", index = 8)
     private Double elevationHeight;