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/ZSecret.java |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
index 1ac6075..ba68adf 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -32,6 +32,7 @@
     private Long id;
 
     private Long userId;
+    private String fileName;
 
     /**
      * 鍒涘缓鏃堕棿
@@ -116,18 +117,6 @@
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date happenEndTime;
-
-
-    /**
-     * 鏈熼檺
-     */
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date vHappenStartTime;
-
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date vHappenEndTime;
 
     /**
      * 鍒嗕韩浜�

--
Gitblit v1.9.1