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/dto/Genealogy.java | 13 -------------
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 1 -
zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java | 12 ------------
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 13 -------------
4 files changed, 0 insertions(+), 39 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;
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
index 1ac6075..14bfbf6 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSecret.java
@@ -117,18 +117,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenEndTime;
-
- /**
- * 鏈熼檺
- */
- @TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date vHappenStartTime;
-
- @TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date vHappenEndTime;
-
/**
* 鍒嗕韩浜�
*/
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;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
index 978a08e..baa26ae 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -66,7 +66,6 @@
.le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate())
.eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace())
.between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime())
- .between(zSecret.getVHappenStartTime() != null && zSecret.getVHappenEndTime() != null, ZSecret::getValidityDate, zSecret.getVHappenStartTime(), zSecret.getVHappenEndTime())
.orderByDesc(ZSecret::getCreateTime);
return lqw;
}
--
Gitblit v1.9.1