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/ZIdea.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZIdea.java b/zhang-content/src/main/java/com/ruoyi/domain/ZIdea.java
index 172a52c..e6a2094 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZIdea.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZIdea.java
@@ -28,9 +28,12 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ private String fileName;
+
+
private Long uid;
- @Excel(name = "鏃堕棿")
+ @Excel(name = "鏃堕棿",dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenTime;
@@ -91,4 +94,8 @@
private Date createTime;
+ /**
+ * 鍒嗕韩浜�
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1