From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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 f2c93da..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
@@ -2,11 +2,13 @@
import lombok.Data;
+import org.joda.time.DateTime;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
+import java.sql.Timestamp;
import java.util.Date;
/**
@@ -74,11 +76,46 @@
@Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
private String by6;
- /** 澶囩敤6 */
+ /** 澶囩敤7 */
@Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
private String by7;
+ /** 澶囩敤8*/
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by8;
+
+ /** 澶囩敤9 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by9;
+
+ /** 澶囩敤10 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by10;
+
+ /** 澶囩敤11 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by11;
+
+ /** 澶囩敤12 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by12;
+
+ /** 澶囩敤13 */
+ @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;
+
+ /** 澶囩敤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 Timestamp by16;
}
--
Gitblit v1.9.1