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

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index b6e5d53..442efe1 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -251,19 +251,6 @@
     @TableField(exist = false)
     private List<ZInfoUser> childList;
 
-    /**
-     * 寮�濮嬫椂闂�  鐢熸棩
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
-    private Date happenStartTime;
-
-    /**
-     * 缁撴潫鏃堕棿
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
-    private Date happenEndTime;
 
 
 

--
Gitblit v1.9.1