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

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java
index e9c57ef..497190b 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java
@@ -5,6 +5,7 @@
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author Jinquan_Ou
@@ -52,6 +53,11 @@
      */
     @Excel(name = "鏀剧疆鍦扮偣")
     private String location;
+    /**
+     * 鍙戠敓鏃堕棿
+     */
+    @Excel(name = "鍙戠敓鏃堕棿")
+    private Date happenTime;
 
     /**
      * 澶囨敞

--
Gitblit v1.9.1