From ccd693a914802ab29632af4db35838512149bacc Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 四月 2025 20:58:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
index c1346f5..61ffddc 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/Genealogy.java
@@ -56,19 +56,6 @@
private Genealogy spouse;
- /**
- * 寮�濮嬫椂闂� 鐢熸棩
- */
- @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