From 5418ea7855d16dcc0169d5ed554f7a23c4b55532 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java |   20 ++++++++++----------
 1 files changed, 10 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 5a93b8c..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
@@ -105,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 Timestamp by16;
+//    /** 澶囩敤16 */
+//    @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+//    private Timestamp by16;
 
 
 }

--
Gitblit v1.9.1