From a0e2549ba5cae6dbe2784754f1c6fe2e987f6460 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期三, 17 五月 2023 10:09:49 +0800 Subject: [PATCH] 调整了字段顺序与前端对应,另外加入是否注销这个字段 --- zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java index 1aaaada..7ea56e0 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java @@ -22,6 +22,17 @@ */ @Excel(name = "璁惧鍚嶇О") private String name; + /** + * 璁板綍鏃堕棿 + */ + @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date happenTime; + /** + * 鏄惁娉ㄩ攢 + */ + @Excel(name = "鏄惁娉ㄩ攢") + private Integer status; /** * 璐拱浜� @@ -47,12 +58,7 @@ @Excel(name = "澶囨敞") private String remark; - /** - * 璁板綍鏃堕棿 - */ - @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private Date happenTime; + } -- Gitblit v1.9.1