From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 0b697dc..5a93b8c 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
@@ -106,15 +106,15 @@
private int by13;
/** 澶囩敤14 */
- @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
+ @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
private Date by14;
/** 澶囩敤15 */
- @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss")
- private Timestamp by15;
+ @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+ private Date by15;
/** 澶囩敤16 */
- @Field(index = true,type = FieldType.Date,analyzer = "yyyy-MM-dd HH:mm:ss ")
+ @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor ")
private Timestamp by16;
--
Gitblit v1.9.1