Merge remote-tracking branch 'origin/master'

hs-web · Nov 10, 2023 · 98167a9 · 98167a9
2 parents f06e168 + ae2e00f
commit 98167a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/param/Param.java b/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/param/Param.java
@@ -6,6 +6,7 @@
 import lombok.Setter;
 import lombok.SneakyThrows;
 
+import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -18,7 +19,8 @@
 @SuppressWarnings("all")
 @Getter
 @Setter
-public class Param implements Cloneable {
+public class Param implements Cloneable, Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * 条件

diff --git a/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/param/Term.java b/hsweb-easy-orm-core/src/main/java/org/hswebframework/ezorm/core/param/Term.java
@@ -5,6 +5,7 @@
 import lombok.Setter;
 import lombok.SneakyThrows;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -16,7 +17,8 @@
  */
 @Getter
 @Setter
-public class Term implements Cloneable {
+public class Term implements Serializable,Cloneable {
+    private static final long serialVersionUID = 1L;
 
     /**
      * 字段

diff --git a/pom.xml b/pom.xml
@@ -301,7 +301,7 @@
             <dependency>
                 <groupId>org.elasticsearch</groupId>
                 <artifactId>elasticsearch</artifactId>
-                <version>7.11.2</version>
+                <version>7.17.13</version>
             </dependency>
 
             <dependency>