diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index 8f03a638..c1bda920 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java @@ -134,7 +134,7 @@ public class LawsMarketStandardDetail implements Serializable { /** * 适用车型 */ - @Excel(name = "适用车型(Vehicle Catagory)", width = 15, dicCode = "applicable_vehicle_type") + @Excel(name = "适用车型(Vehicle Category)", width = 15, dicCode = "applicable_vehicle_type") @Dict(dicCode = "applicable_vehicle_type") @ApiModelProperty(value = "适用车型") private String applicableVehicle; @@ -158,7 +158,7 @@ public class LawsMarketStandardDetail implements Serializable { * 类型 */ @Dict(dicCode = "type") - @Excel(name = "类型(Type)", width = 15, dicCode = "type") + @Excel(name = "类型(Requirement Category)", width = 15, dicCode = "type") @ApiModelProperty(value = "类型") private String type; @@ -231,7 +231,7 @@ public class LawsMarketStandardDetail implements Serializable { * 备注 */ @ApiModelProperty(value = "备注") - @Excel(name = "备注(Comments)", width = 15) + @Excel(name = "备注(Note)", width = 15) private String remark; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java index d7aef1a8..457d9d6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java @@ -132,16 +132,11 @@ public class LawsMarketStandardDetailExcel implements Serializable { /** * 适用车型 */ - @Excel(name = "适用车型(Vehicle Catagory)", width = 15, dicCode = "applicable_vehicle_type") + @Excel(name = "适用车型(Vehicle Category)", width = 15, dicCode = "applicable_vehicle_type") @Dict(dicCode = "applicable_vehicle_type") @ApiModelProperty(value = "适用车型") private String applicableVehicle; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - private String remark; /** * 认证对象 @@ -162,7 +157,7 @@ public class LawsMarketStandardDetailExcel implements Serializable { * 类型 */ @Dict(dicCode = "type") - @Excel(name = "类型(Type)", width = 15, dicCode = "type") + @Excel(name = "类型(Requirement Category)", width = 15, dicCode = "type") @ApiModelProperty(value = "类型") private String type; @@ -232,6 +227,13 @@ public class LawsMarketStandardDetailExcel implements Serializable { @Excel(name = "要求类型(Optional/Compulsory)", width = 15,dicCode = "requirement_type") private String requireType; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @Excel(name = "备注(Note)", width = 15) + private String remark; + /** * 清单Id diff --git a/laws-modules/src/main/resources/excelTemplate/导入模板-市场法规清单.xls b/laws-modules/src/main/resources/excelTemplate/导入模板-市场法规清单.xls index 0a227156..53543055 100644 Binary files a/laws-modules/src/main/resources/excelTemplate/导入模板-市场法规清单.xls and b/laws-modules/src/main/resources/excelTemplate/导入模板-市场法规清单.xls differ