From b10f260189e5db5b89d9a85ce4fb08984d2aae2a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 10:59:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java |   12 ------------
 1 files changed, 0 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..14bfbf6 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -117,18 +117,6 @@
     @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