From 8e4728f8f10289936e973e3bbb4b5e4519e59c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 3 Sep 2024 16:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsMarketStandardDetail.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) 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 ca272d61..6b0f0d71 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 @@ -80,7 +80,7 @@ public class LawsMarketStandardDetail implements Serializable { */ @NotBlank(message = "标准编号不能为空") @ApiModelProperty(value = "标准编号") - @Excel(name = "标准编号", width = 15, mergeVertical = true) + @Excel(name = "标准编号", width = 15, mergeVertical = true, mergeRely = {0}) private String standardNumber; /** @@ -88,41 +88,41 @@ public class LawsMarketStandardDetail implements Serializable { */ @ApiModelProperty(value = "标准名称") @NotBlank(message = "标准名称不能为空") - @Excel(name = "标准名称", width = 15, mergeVertical = true, mergeRely = 1) + @Excel(name = "标准名称", width = 15, mergeVertical = true, mergeRely = {0}) private String standardName; /** * 标准英文名称 */ @ApiModelProperty(value = "标准英文名称") - @Excel(name = "标准英文名称", width = 15, mergeVertical = true, mergeRely = 1) + @Excel(name = "标准英文名称", width = 15, mergeVertical = true, mergeRely = {0}) private String standardEnglishName; /** * 新生产车实施日期 */ - @Excel(name = "新生产车实施日期", width = 15, mergeVertical = true, mergeRely = 1) + @Excel(name = "新生产车实施日期", width = 15, mergeVertical = true, mergeRely = {0}) @ApiModelProperty(value = "新生产车实施日期") private String newProductImplDate; /** * 新认证车实施日期 */ - @Excel(name = "新认证车实施日期", width = 15, mergeVertical = true, mergeRely = 1) + @Excel(name = "新认证车实施日期", width = 15, mergeVertical = true, mergeRely = {0}) @ApiModelProperty(value = "新认证车实施日期") private String newAuthImplDate; /** * 注册日期 */ - @Excel(name = "注册日期", width = 15, mergeVertical = true, mergeRely = 1) + @Excel(name = "注册日期", width = 15, mergeVertical = true, mergeRely = {0}) @ApiModelProperty(value = "注册日期") private String registrationDate; /** * 国家 */ - @Excel(name = "适用国家/地区", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = 1) + @Excel(name = "适用国家/地区", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = {0}) @NotBlank(message = "适用国家/地区不能为空") @ApiModelProperty(value = "国家") @Dict(dicCode = "market_state") @@ -131,7 +131,7 @@ public class LawsMarketStandardDetail implements Serializable { /** * 适用车型 */ - @Excel(name = "适用车型", width = 15, dicCode = "applicable_vehicle_type", mergeVertical = true, mergeRely = 1) + @Excel(name = "适用车型", width = 15, dicCode = "applicable_vehicle_type", mergeVertical = true, mergeRely = {0}) @Dict(dicCode = "applicable_vehicle_type") @ApiModelProperty(value = "适用车型") private String applicableVehicle; @@ -141,21 +141,21 @@ public class LawsMarketStandardDetail implements Serializable { */ @ApiModelProperty(value = "认证对象") @Dict(dicCode = "authentication_object") - @Excel(name = "认证对象", width = 15, dicCode = "authentication_object", mergeVertical = true, mergeRely = 1) + @Excel(name = "认证对象", width = 15, dicCode = "authentication_object", mergeVertical = true, mergeRely = {0}) private String authenticationObject; /** * 认证交付物 */ @ApiModelProperty(value = "认证交付物") - @Excel(name = "认证交付物", width = 15, mergeVertical = true, mergeRely = 1) + @Excel(name = "认证交付物", width = 15, mergeVertical = true, mergeRely = {0}) private String certifyTheDeliverables; /** * 类型 */ @Dict(dicCode = "type") - @Excel(name = "类型", width = 15, dicCode = "type", mergeVertical = true, mergeRely = 1) + @Excel(name = "类型", width = 15, dicCode = "type", mergeVertical = true, mergeRely = {0}) @ApiModelProperty(value = "类型") private String type; @@ -164,7 +164,7 @@ public class LawsMarketStandardDetail implements Serializable { */ @Dict(dicCode = "dynamic_type") @ApiModelProperty(value = "动力类型") - @Excel(name = "动力类型", width = 15, dicCode = "dynamic_type", mergeVertical = true, mergeRely = 1) + @Excel(name = "动力类型", width = 15, dicCode = "dynamic_type", mergeVertical = true, mergeRely = {0}) private String dynamicType; /** @@ -173,7 +173,7 @@ public class LawsMarketStandardDetail implements Serializable { @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主控部门") @NotBlank(message = "主控部门不能为空") - @Excel(name = "主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name", mergeVertical = true, mergeRely = 1) + @Excel(name = "主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name", mergeVertical = true, mergeRely = {0}) private String mainDept; /** @@ -182,7 +182,7 @@ public class LawsMarketStandardDetail implements Serializable { @ApiModelProperty(value = "主控部门专业模块") @NotBlank(message = "主控部门专业模块不能为空") @Dict(dicCode = "professional_module") - @Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module", mergeVertical = true, mergeRely = 1) + @Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module", mergeVertical = true, mergeRely = {0}) private String mainDeptProfMode; /** @@ -190,14 +190,14 @@ public class LawsMarketStandardDetail implements Serializable { */ @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "关联部门") - @Excel(name = "关联部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name", mergeVertical = true, mergeRely = 1) + @Excel(name = "关联部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name", mergeVertical = true, mergeRely = {0}) private String associateDept; /** * 关联部门专业模块 */ @ApiModelProperty(value = "关联部门专业模块") - @Excel(name = "关联部门专业模块", width = 15, dicCode = "professional_module", mergeVertical = true, mergeRely = 1) + @Excel(name = "关联部门专业模块", width = 15, dicCode = "professional_module", mergeVertical = true, mergeRely = {0}) @Dict(dicCode = "professional_module") private String associateDeptProfMode; @@ -205,7 +205,7 @@ public class LawsMarketStandardDetail implements Serializable { * 批量限制 */ @ApiModelProperty(value = "批量限制") - @Excel(name = "批量限制", width = 15, dicCode = "batch_restriction", mergeVertical = true, mergeRely = 1) + @Excel(name = "批量限制", width = 15, dicCode = "batch_restriction", mergeVertical = true, mergeRely = {0}) @Dict(dicCode = "batch_restriction") private String batchLimit; @@ -214,7 +214,7 @@ public class LawsMarketStandardDetail implements Serializable { */ @Dict(dicCode = "automatic_driving_level") @ApiModelProperty(value = "自动驾驶等级") - @Excel(name = "自动驾驶等级", width = 15,dicCode = "automatic_driving_level", mergeVertical = true, mergeRely = 1) + @Excel(name = "自动驾驶等级", width = 15,dicCode = "automatic_driving_level", mergeVertical = true, mergeRely = {0}) private String autopilotLevel; /** @@ -222,13 +222,13 @@ public class LawsMarketStandardDetail implements Serializable { */ @Dict(dicCode = "requirement_type") @ApiModelProperty(value = "要求类型") - @Excel(name = "要求类型", width = 15,dicCode = "requirement_type", mergeVertical = true, mergeRely = 1) + @Excel(name = "要求类型", width = 15,dicCode = "requirement_type", mergeVertical = true, mergeRely = {0}) private String requireType; /** * 备注 */ @ApiModelProperty(value = "备注") - @Excel(name = "备注", width = 15, mergeVertical = true, mergeRely = 1) + @Excel(name = "备注", width = 15, mergeVertical = true, mergeRely = {0}) private String remark;