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/ZfEventExcelBean.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java
index 01e7276..e5d850a 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java
@@ -5,6 +5,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author Jinquan_Ou
@@ -39,4 +40,11 @@
      */
     @Excel(name="澶囨敞淇℃伅")
     private String remark;
+
+
+    /**
+     * 鍙戠敓鏃堕棿
+     */
+    @Excel(name="鍙戠敓鏃堕棿")
+    private Date happenTime;;
 }

--
Gitblit v1.9.1