From 0514fa9f45000b9584deb2390b656457f9210455 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 18:29:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8E=BB=E9=99=A4=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectLawsInventoryEO.java | 18 +++++++++--------- .../entity/ProjectLawsInventoryEOEn.java | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index c66e7ce3d..8ebc4d8d4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -102,19 +102,19 @@ public class ProjectLawsInventoryEO implements Serializable { /**适用地区*/ @ApiModelProperty(value = "适用地区") //@Dict(dicCode ="region") - @Excel(name = "适用地区", width = 15, dicCode = "region") +// @Excel(name = "适用地区", width = 15, dicCode = "region") private java.lang.String region; @TableField(exist = false) private String region_dictText; /**对应标准*/ - @Excel(name = "对应标准", width = 20) +// @Excel(name = "对应标准", width = 20) @ApiModelProperty(value = "对应标准") private String correspondingStandard; /**实施类别*/ - @Excel(name = "实施类别", width = 20,dicCode ="implement_type") +// @Excel(name = "实施类别", width = 20,dicCode ="implement_type") @ApiModelProperty(value = "实施类别") //@Dict(dicCode ="implement_type") private String implementType; @@ -122,7 +122,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String implementType_dictText; /**新车型实施日期*/ - @Excel(name = "新车型实施日期", width = 20, format = "yyyy-MM-dd") +// @Excel(name = "新车型实施日期", width = 20, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新车型实施日期") @@ -132,7 +132,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String xin1Che1Xing2Shi2Shi1Ri4Qi1String; /**在产车实施日期*/ - @Excel(name = "在产车实施日期", width = 20, format = "yyyy-MM-dd") +// @Excel(name = "在产车实施日期", width = 20, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "在产车实施日期") @@ -162,7 +162,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String applicableSupplement; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 20) +// @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") private String wvtaId; @@ -187,7 +187,7 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "认证工程师id") private String homologationEngineerId; - @Excel(name = "认证工程师", width = 20) +// @Excel(name = "认证工程师", width = 20) @TableField(exist = false) @ApiModelProperty(value = "认证工程师名称") private String homologationEngineerName;//认证工程师名称 @@ -238,7 +238,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String designInitiatorId; /**设计符合性确认-发起人名称*/ - @Excel(name = "发起人", width = 20,groupName = "设计符合性确认") +// @Excel(name = "发起人", width = 20,groupName = "设计符合性确认") @TableField(exist = false) private String designInitiatorName; @@ -372,7 +372,7 @@ public class ProjectLawsInventoryEO implements Serializable { private String verifyInitiatorId; /**验证符合性确认-发起人名称*/ - @Excel(name = "发起人", width = 20,groupName = "验证符合性确认") +// @Excel(name = "发起人", width = 20,groupName = "验证符合性确认") @TableField(exist = false) private String verifyInitiatorName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java index d380e7c48..a5f786793 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java @@ -101,29 +101,29 @@ public class ProjectLawsInventoryEOEn implements Serializable { /**适用地区*/ @ApiModelProperty(value = "适用地区") @Dict(dicCode ="Area") - @Excel(name = "Area", width = 15) +// @Excel(name = "Area", width = 15) private String region; /**对应标准*/ - @Excel(name = "Compare EU/CN", width = 20) +// @Excel(name = "Compare EU/CN", width = 20) @ApiModelProperty(value = "对应标准") private String correspondingStandard; /**实施类别*/ - @Excel(name = "Usage", width = 20,dicCode ="implement_type") +// @Excel(name = "Usage", width = 20,dicCode ="implement_type") @ApiModelProperty(value = "实施类别") @Dict(dicCode ="implement_type") private String implementType; /**新车型实施日期*/ - @Excel(name = "New Type Execution Date", width = 30, format = "yyyy-MM-dd") +// @Excel(name = "New Type Execution Date", width = 30, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新车型实施日期") private Date xin1Che1Xing2Shi2Shi1Ri4Qi1; /**在产车实施日期*/ - @Excel(name = "New Vehicle Execution Date", width = 30, format = "yyyy-MM-dd") +// @Excel(name = "New Vehicle Execution Date", width = 30, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "在产车实施日期") @@ -146,7 +146,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String applicableSupplement; /**WVTA ID*/ - @Excel(name = "WVTA ID", width = 20) +// @Excel(name = "WVTA ID", width = 20) @ApiModelProperty(value = "WVTA ID") private String wvtaId; @@ -169,7 +169,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { @ApiModelProperty(value = "认证工程师id") private String homologationEngineerId; - @Excel(name = "Homologation Engineer", width = 25) +// @Excel(name = "Homologation Engineer", width = 25) @TableField(exist = false) @ApiModelProperty(value = "认证工程师名称") private String homologationEngineerName;//认证工程师名称 @@ -213,7 +213,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String designInitiatorId; /**设计符合性确认-发起人名称*/ - @Excel(name = "Reviewer", width = 25,groupName = "Design Compliance Check") +// @Excel(name = "Reviewer", width = 25,groupName = "Design Compliance Check") @TableField(exist = false) private String designInitiatorName; @@ -325,7 +325,7 @@ public class ProjectLawsInventoryEOEn implements Serializable { private String verifyInitiatorId; /**验证符合性确认-发起人名称*/ - @Excel(name = "Reviewer", width = 25,groupName = "Validation Compliance Check") +// @Excel(name = "Reviewer", width = 25,groupName = "Validation Compliance Check") @TableField(exist = false) private String verifyInitiatorName;