fix(jg):BUG 气瓶导入模板调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoCylinderExcelDto.java

@@ -166,127 +166,127 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     private String inspectDate;
 
     @ApiModelProperty(value = "检验报告编号")
-    @ExcelProperty(value = "检验报告编号")
+    @ExcelProperty(value = "检验报告编号", index = 28)
     private String inspectReportNo;
 
     //技术参数
-    @ExcelProperty(value = "额定质量(kg)", index = 28)
+    @ExcelProperty(value = "额定质量(kg)", index = 29)
     @ApiModelProperty(value = "额定质量(kg)")
     private String ratedQuality;
 
-    @ExcelProperty(value = "使用环境温度(℃)", index = 29)
+    @ExcelProperty(value = "使用环境温度(℃)", index = 30)
     @ApiModelProperty(value = "使用环境温度(℃)")
     private String ambientTemperature;
 
-    @ExcelProperty(value = "单瓶容积(m3)", index = 30)
+    @ExcelProperty(value = "单瓶容积(m3)", index = 31)
     @ApiModelProperty(value = "单瓶容积(m3)")
     @NotBlank(message = "单瓶容积(m3)不能为空")
     private String singleBottleVolume;
 
-    @ExcelProperty(value = "型号", index = 31)
+    @ExcelProperty(value = "型号", index = 32)
     @ApiModelProperty(value = "型号")
     private String modelNumber;
 
-    @ExcelProperty(value = "充装介质", index = 32)
+    @ExcelProperty(value = "充装介质", index = 33)
     @ApiModelProperty(value = "充装介质")
     @NotBlank(message = "充装介质不能为空")
     private String chargingMedium;
 
-    @ExcelProperty(value = "规格", index = 33)
+    @ExcelProperty(value = "规格", index = 34)
     @ApiModelProperty(value = "规格")
     private String specification;
 
-    @ExcelProperty(value = "外径", index = 34)
+    @ExcelProperty(value = "外径", index = 35)
     @ApiModelProperty(value = "外径")
     private String outsideDiameter;
 
-    @ExcelProperty(value = "壁厚", index = 35)
+    @ExcelProperty(value = "壁厚", index = 36)
     @ApiModelProperty(value = "壁厚")
     private String wallThickness;
 
-    @ExcelProperty(value = "长度", index = 36)
+    @ExcelProperty(value = "长度", index = 37)
     @ApiModelProperty(value = "长度")
     private String length;
 
-    @ExcelProperty(value = "公称工作压力(MPa)", index = 37)
+    @ExcelProperty(value = "公称工作压力(MPa)", index = 38)
     @ApiModelProperty(value = "公称工作压力(MPa)")
     @NotBlank(message = "公称工作压力(MPa)不能为空")
     private String nominalWorkingPressure;
 
-    @ExcelProperty(value = "材料(管路)", index = 38)
+    @ExcelProperty(value = "材料(管路)", index = 39)
     @ApiModelProperty(value = "材料(管路)")
     private String piping;
 
-    @ExcelProperty(value = "无损检测方法(气瓶)", index = 39, converter = NondestructConverter.class)
+    @ExcelProperty(value = "无损检测方法(气瓶)", index = 40, converter = NondestructConverter.class)
     @ApiModelProperty(value = "无损检测方法(气瓶)")
     private String qpLossless;//5988
 
-    @ExcelProperty(value = "材料(瓶体)", index = 40)
+    @ExcelProperty(value = "材料(瓶体)", index = 41)
     @ApiModelProperty(value = "材料(瓶体)")
     private String bottleBody;
 
-    @ExcelProperty(value = "材料(端塞)", index = 41)
+    @ExcelProperty(value = "材料(端塞)", index = 42)
     @ApiModelProperty(value = "材料(端塞)")
     private String endPlug;
 
-    @ExcelProperty(value = "无损检测比例(管路)(%)", index = 42)
+    @ExcelProperty(value = "无损检测比例(管路)(%)", index = 43)
     @ApiModelProperty(value = "无损检测比例(管路)(%)")
     private String glRatio;
 
-    @ExcelProperty(value = "无损检测比例(气瓶)(%)", index = 43)
+    @ExcelProperty(value = "无损检测比例(气瓶)(%)", index = 44)
     @ApiModelProperty(value = "无损检测比例(气瓶)(%)")
     private String qpRatio;
 
-    @ExcelProperty(value = "无损检测方法(管路)", index = 44, converter = NondestructConverter.class)
+    @ExcelProperty(value = "无损检测方法(管路)", index = 45, converter = NondestructConverter.class)
     @ApiModelProperty(value = "无损检测方法(管路)")
     private String glLossless;
 
-    @ExcelProperty(value = "耐压实验压力(气瓶)(Mpa)", index = 45)
+    @ExcelProperty(value = "耐压实验压力(气瓶)(Mpa)", index = 46)
     @ApiModelProperty(value = "耐压实验压力(气瓶)(Mpa)")
     private String qpPressure;
 
-    @ExcelProperty(value = "耐压实验压力(管路)(Mpa)", index = 46)
+    @ExcelProperty(value = "耐压实验压力(管路)(Mpa)", index = 47)
     @ApiModelProperty(value = "耐压实验压力(管路)(Mpa)")
     private String glPressure;
 
-    @ExcelProperty(value = "气密性试验压力(气瓶)(Mpa)", index = 47)
+    @ExcelProperty(value = "气密性试验压力(气瓶)(Mpa)", index = 48)
     @ApiModelProperty(value = "气密性试验压力(气瓶)(Mpa)")
     private String qpAirTightness;
 
-    @ExcelProperty(value = "气体置换后压力(MPa)", index = 48)
+    @ExcelProperty(value = "气体置换后压力(MPa)", index = 49)
     @ApiModelProperty(value = "气体置换后压力(MPa)")
     private String displacementPressure;
 
-    @ExcelProperty(value = "热处理方式", index = 49)
+    @ExcelProperty(value = "热处理方式", index = 50)
     @ApiModelProperty(value = "热处理方式")
     private String heatTreatmentMethod;
 
-    @ExcelProperty(value = "气密性实验压力(管路)(MPa)", index = 50)
+    @ExcelProperty(value = "气密性实验压力(管路)(MPa)", index = 51)
     @ApiModelProperty(value = "气密性实验压力(管路)(MPa)")
     private String glAirTightness;
 
-    @ExcelProperty(value = "气瓶安装位置", index = 51)
+    @ExcelProperty(value = "气瓶安装位置", index = 52)
     @ApiModelProperty(value = "气瓶安装位置")
     private String installationPosition;
 
-    @ExcelProperty(value = "瓶体内含氧量(%)", index = 52)
+    @ExcelProperty(value = "瓶体内含氧量(%)", index = 53)
     @ApiModelProperty(value = "瓶体内含氧量(%)")
     private String oxygen;
 
-    @ExcelProperty(value = "热处理温度(℃)", index = 53)
+    @ExcelProperty(value = "热处理温度(℃)", index = 54)
     @ApiModelProperty(value = "热处理温度(℃)")
     private String qpHeatTreatmentTemperature;
 
     /**
      * 信息化管理字段-信息化管理情况
      */
-    @ExcelProperty(value = "信息化管理情况",index = 54, converter = InformationSituationConverter.class)
+    @ExcelProperty(value = "信息化管理情况", index = 55, converter = InformationSituationConverter.class)
     private String informationSituation;
 
     /**
      * 信息化管理字段-二维码或者电子标签编号
      */
-    @ExcelProperty(value = "二维码或者电子标签编号",index = 55)
+    @ExcelProperty(value = "二维码或者电子标签编号", index = 56)
     private String informationManageCode;
 
     @ExcelIgnore