From 2a83c4c57e66ea333d49b02a4887afd21a2fffbe Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 13 Sep 2024 20:46:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsEvaluationNotMetLibrary.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index 864a2aee..ad3c2ba5 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -182,7 +182,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * PCR编号 */ @ApiModelProperty(value = "PCR编号") - @Excel(name = "PCR编号", width = 15, orderNum = "11") + @Excel(name = "PCR编号", width = 15, orderNum = "13") private String pcrNo; /** @@ -206,7 +206,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { @ApiModelProperty(value = "整改完成日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @Excel(name = "整改完成日期", width = 15, orderNum = "12", format = "yyyy-MM-dd") + @Excel(name = "整改完成日期", width = 15, orderNum = "14", format = "yyyy-MM-dd") private Date rectifyCompleteDate; /** @@ -220,7 +220,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 附件 */ @ApiModelProperty(value = "附件") - @ExcelCollection(name = "", orderNum = "13") + @ExcelCollection(name = "", orderNum = "15") @TableField(exist = false) private List fileList = Collections.emptyList(); @@ -270,7 +270,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { * 关闭人 */ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - @Excel(name = "关闭人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") + @Excel(name = "关闭人", width = 15, orderNum = "11", dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')") @ApiModelProperty(value = "关闭人") private String closeUser;