From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 17 -----------------
1 files changed, 0 insertions(+), 17 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..bb8ab99 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -250,21 +250,4 @@
*/
@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