From 8e27235844b5640441d810e18e5adc863479735b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 19 五月 2023 21:41:22 +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/ZfEconomyExcelBean.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
index e549d97..fdef2d3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
@@ -21,6 +21,12 @@
@Excel(name = "鏀舵敮绫诲瀷",readConverterExp = "0=鍩洪噾,1=鍙拌处")
private Integer type;
/**
+ * 鍙戠敓鏃堕棿
+ */
+ @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date happenTime;
+ /**
* 鏀跺叆/鏀嚭
*/
@Excel(name = "鏀跺叆/鏀嚭")
@@ -56,10 +62,5 @@
@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