From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
index b9174ac..134b255 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
@@ -29,6 +29,9 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ private String fileName;
+
/**
* 鐢ㄦ埛id
*/
@@ -72,6 +75,14 @@
private Date happenTime;
/**
+ * 缁撴潫鏃堕棿
+ */
+ @Excel(name = "缁撴潫鏃堕棿",dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+
+ /**
* 鐢靛瓙鏂囦欢璺緞
*/
@Excel(name = "鐢靛瓙鏂囦欢璺緞")
--
Gitblit v1.9.1