From 1c1f5a03a44a811bd9c8e43fa664981f22cf21bd Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 25 四月 2024 21:27:52 +0800
Subject: [PATCH] 修改代码
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 5 +++--
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 11 ++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
index 6a77ae1..0b697dc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
@@ -8,6 +8,7 @@
import org.springframework.data.elasticsearch.annotations.FieldType;
+import java.sql.Timestamp;
import java.util.Date;
/**
@@ -105,16 +106,16 @@
private int by13;
/** 澶囩敤14 */
- @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor HH:mm:ss")
+ @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
private Date by14;
/** 澶囩敤15 */
- @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
- private Date by15;
+ @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
+ private Timestamp by15;
/** 澶囩敤16 */
- @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor ")
- private Date by16;
+ @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss ")
+ private Timestamp by16;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
index 56033be..4bf2f5a 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -9,6 +9,7 @@
import lombok.Data;
import org.joda.time.DateTime;
+import java.sql.Timestamp;
import java.util.Date;
@Data
@@ -57,7 +58,7 @@
*/
@Excel(name = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Date endTime;
+ private Timestamp endTime;
/**
@@ -95,7 +96,7 @@
* 鐢熸垚鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Date createTime;
+ private Timestamp createTime;
}
--
Gitblit v1.9.1