From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
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