From a150bbd71cb204432c945d5988b3b9ac21a99b31 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 18 十一月 2024 21:42:44 +0800
Subject: [PATCH] 修改家谱搜索
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 077b262..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;
@@ -149,6 +151,12 @@
@Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
private Integer isMyFamily;
+ /**
+ * 鑷垜浠嬬粛
+ */
+
+ @Excel(name = "鑷垜浠嬬粛")
+ private String selfIntroduction;
@TableField(exist = false)
private String familyName;
@@ -224,7 +232,6 @@
private String secondFamilyId;
-
private Long sysId;
/**
* 浠ｆ暟
@@ -244,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