From 63240c3b7edb2a149511fdbe4108755ad60db91f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 19 十一月 2024 15:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 095b1b3..b6e5d53 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -5,8 +5,10 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
+import org.apache.ibatis.type.JdbcType;
import java.io.Serializable;
+import java.sql.Timestamp;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -249,6 +251,20 @@
@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