QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改市场法规清单合并

Browse Source
This commit is contained in:
梁琦涛
2024-09-03 16:41:08 +08:00
parent ced271609b
commit 8e4728f8f1
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+20 -20
View File
@@ -80,7 +80,7 @@ public class LawsMarketStandardDetail implements Serializable {
*/ */
@NotBlank(message = "标准编号不能为空") @NotBlank(message = "标准编号不能为空")
@ApiModelProperty(value = "标准编号") @ApiModelProperty(value = "标准编号")
@Excel(name = "标准编号", width = 15, mergeVertical = true) @Excel(name = "标准编号", width = 15, mergeVertical = true, mergeRely = {0})
private String standardNumber; private String standardNumber;
/** /**
@@ -88,41 +88,41 @@ public class LawsMarketStandardDetail implements Serializable {
*/ */
@ApiModelProperty(value = "标准名称") @ApiModelProperty(value = "标准名称")
@NotBlank(message = "标准名称不能为空") @NotBlank(message = "标准名称不能为空")
@Excel(name = "标准名称", width = 15, mergeVertical = true, mergeRely = 1) @Excel(name = "标准名称", width = 15, mergeVertical = true, mergeRely = {0})
private String standardName; private String standardName;
/** /**
* 标准英文名称 * 标准英文名称
*/ */
@ApiModelProperty(value = "标准英文名称") @ApiModelProperty(value = "标准英文名称")
@Excel(name = "标准英文名称", width = 15, mergeVertical = true, mergeRely = 1) @Excel(name = "标准英文名称", width = 15, mergeVertical = true, mergeRely = {0})
private String standardEnglishName; private String standardEnglishName;
/** /**
* 新生产车实施日期 * 新生产车实施日期
*/ */
@Excel(name = "新生产车实施日期", width = 15, mergeVertical = true, mergeRely = 1) @Excel(name = "新生产车实施日期", width = 15, mergeVertical = true, mergeRely = {0})
@ApiModelProperty(value = "新生产车实施日期") @ApiModelProperty(value = "新生产车实施日期")
private String newProductImplDate; private String newProductImplDate;
/** /**
* 新认证车实施日期 * 新认证车实施日期
*/ */
@Excel(name = "新认证车实施日期", width = 15, mergeVertical = true, mergeRely = 1) @Excel(name = "新认证车实施日期", width = 15, mergeVertical = true, mergeRely = {0})
@ApiModelProperty(value = "新认证车实施日期") @ApiModelProperty(value = "新认证车实施日期")
private String newAuthImplDate; private String newAuthImplDate;
/** /**
* 注册日期 * 注册日期
*/ */
@Excel(name = "注册日期", width = 15, mergeVertical = true, mergeRely = 1) @Excel(name = "注册日期", width = 15, mergeVertical = true, mergeRely = {0})
@ApiModelProperty(value = "注册日期") @ApiModelProperty(value = "注册日期")
private String registrationDate; 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 = "适用国家/地区不能为空") @NotBlank(message = "适用国家/地区不能为空")
@ApiModelProperty(value = "国家") @ApiModelProperty(value = "国家")
@Dict(dicCode = "market_state") @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") @Dict(dicCode = "applicable_vehicle_type")
@ApiModelProperty(value = "适用车型") @ApiModelProperty(value = "适用车型")
private String applicableVehicle; private String applicableVehicle;
@@ -141,21 +141,21 @@ public class LawsMarketStandardDetail implements Serializable {
*/ */
@ApiModelProperty(value = "认证对象") @ApiModelProperty(value = "认证对象")
@Dict(dicCode = "authentication_object") @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; private String authenticationObject;
/** /**
* 认证交付物 * 认证交付物
*/ */
@ApiModelProperty(value = "认证交付物") @ApiModelProperty(value = "认证交付物")
@Excel(name = "认证交付物", width = 15, mergeVertical = true, mergeRely = 1) @Excel(name = "认证交付物", width = 15, mergeVertical = true, mergeRely = {0})
private String certifyTheDeliverables; private String certifyTheDeliverables;
/** /**
* 类型 * 类型
*/ */
@Dict(dicCode = "type") @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 = "类型") @ApiModelProperty(value = "类型")
private String type; private String type;
@@ -164,7 +164,7 @@ public class LawsMarketStandardDetail implements Serializable {
*/ */
@Dict(dicCode = "dynamic_type") @Dict(dicCode = "dynamic_type")
@ApiModelProperty(value = "动力类型") @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; private String dynamicType;
/** /**
@@ -173,7 +173,7 @@ public class LawsMarketStandardDetail implements Serializable {
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "主控部门") @ApiModelProperty(value = "主控部门")
@NotBlank(message = "主控部门不能为空") @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; private String mainDept;
/** /**
@@ -182,7 +182,7 @@ public class LawsMarketStandardDetail implements Serializable {
@ApiModelProperty(value = "主控部门专业模块") @ApiModelProperty(value = "主控部门专业模块")
@NotBlank(message = "主控部门专业模块不能为空") @NotBlank(message = "主控部门专业模块不能为空")
@Dict(dicCode = "professional_module") @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; private String mainDeptProfMode;
/** /**
@@ -190,14 +190,14 @@ public class LawsMarketStandardDetail implements Serializable {
*/ */
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "关联部门") @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; private String associateDept;
/** /**
* 关联部门专业模块 * 关联部门专业模块
*/ */
@ApiModelProperty(value = "关联部门专业模块") @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") @Dict(dicCode = "professional_module")
private String associateDeptProfMode; private String associateDeptProfMode;
@@ -205,7 +205,7 @@ public class LawsMarketStandardDetail implements Serializable {
* 批量限制 * 批量限制
*/ */
@ApiModelProperty(value = "批量限制") @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") @Dict(dicCode = "batch_restriction")
private String batchLimit; private String batchLimit;
@@ -214,7 +214,7 @@ public class LawsMarketStandardDetail implements Serializable {
*/ */
@Dict(dicCode = "automatic_driving_level") @Dict(dicCode = "automatic_driving_level")
@ApiModelProperty(value = "自动驾驶等级") @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; private String autopilotLevel;
/** /**
@@ -222,13 +222,13 @@ public class LawsMarketStandardDetail implements Serializable {
*/ */
@Dict(dicCode = "requirement_type") @Dict(dicCode = "requirement_type")
@ApiModelProperty(value = "要求类型") @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; private String requireType;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
@Excel(name = "备注", width = 15, mergeVertical = true, mergeRely = 1) @Excel(name = "备注", width = 15, mergeVertical = true, mergeRely = {0})
private String remark; private String remark;