From c8668a4a71987199e610781e7ac8cc02faa4f082 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 16 十二月 2025 22:12:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 a119baa..0be4d6e 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;
/**
@@ -104,17 +105,17 @@
@Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
private int by13;
- /** 澶囩敤14 */
- @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
- private Date by14;
+// /** 澶囩敤14 */
+// @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+// private Date by14;
+//
+// /** 澶囩敤15 */
+// @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+// private Date by15;
- /** 澶囩敤15 */
- @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
- private Date by15;
-
- /** 澶囩敤16 */
- @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor ")
- private Date by16;
+// /** 澶囩敤16 */
+// @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+// private Timestamp by16;
}
--
Gitblit v1.9.1