diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/ExportDataWithDelayVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/ExportDataWithDelayVo.java index d79b8123..e5d8ef62 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/ExportDataWithDelayVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/ExportDataWithDelayVo.java @@ -27,21 +27,21 @@ public class ExportDataWithDelayVo { /** * 稽查依据标准号 */ - @Excel(name = "稽查依据标准号", width = 15, needMerge = true) + @Excel(name = "稽查依据标准号", width = 15) @ApiModelProperty(value = "稽查依据标准号") private String inspectNo; /** * 稽查依据标准名称 */ - @Excel(name = "稽查依据标准名称", width = 16, needMerge = true) + @Excel(name = "稽查依据标准名称", width = 16) @ApiModelProperty(value = "稽查依据标准名称") private String inspectName; /** * 计划稽查对象 */ - @Excel(name = "计划稽查对象", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", needMerge = true) + @Excel(name = "计划稽查对象", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @ApiModelProperty(value = "计划稽查对象") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") private String planInspectObject; @@ -49,14 +49,14 @@ public class ExportDataWithDelayVo { /** * 主责标准化工作组 */ - @Excel(name = "主责标准化工作组", width = 15, needMerge = true) + @Excel(name = "主责标准化工作组", width = 15) @ApiModelProperty(value = "主责标准化工作组") private String standardizationWorkGroup; /** * 所属部门 */ - @Excel(name = "所属部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", needMerge = true) + @Excel(name = "所属部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @ApiModelProperty(value = "所属部门") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") private String belongDept; @@ -64,7 +64,7 @@ public class ExportDataWithDelayVo { /** * 计划稽查日期 */ - @Excel(name = "计划稽查日期", width = 15, format = "yyyy-MM-dd", needMerge = true) + @Excel(name = "计划稽查日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "计划稽查日期") @@ -80,7 +80,7 @@ public class ExportDataWithDelayVo { /** * 稽查负责人 翻译 */ - @Excel(name = "稽查负责人", width = 15, needMerge = true) + @Excel(name = "稽查负责人", width = 15) @ApiModelProperty(value = "稽查负责人 翻译") private String inspectUserDictText; @@ -94,7 +94,7 @@ public class ExportDataWithDelayVo { /** * 标准化组对接人 翻译 */ - @Excel(name = "标准化组对接人", width = 15, needMerge = true) + @Excel(name = "标准化组对接人", width = 15) @ApiModelProperty(value = "标准化组对接人 翻译") @TableField(exist = false) private String standardizationDockingUserDictText; @@ -102,7 +102,7 @@ public class ExportDataWithDelayVo { /** * 实际稽查完成日期 */ - @Excel(name = "实际稽查完成日期", width = 16, format = "yyyy-MM-dd", needMerge = true) + @Excel(name = "实际稽查完成日期", width = 16, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "实际稽查完成日期") @@ -118,14 +118,14 @@ public class ExportDataWithDelayVo { /** * 实际稽查人 翻译 */ - @Excel(name = "实际稽查人", width = 15, needMerge = true) + @Excel(name = "实际稽查人", width = 15) @ApiModelProperty(value = "实际稽查人 翻译") private String actualInspectUserDictText; /** * 稽查状态 */ - @Excel(name = "稽查状态", width = 15, dicCode = "inspect_status", needMerge = true) + @Excel(name = "稽查状态", width = 15, dicCode = "inspect_status") @Dict(dicCode = "inspect_status") @ApiModelProperty(value = "稽查状态") private String inspectStatus;