diff --git a/easy-es-annotation/pom.xml b/easy-es-annotation/pom.xml
index b3febf37..f06a5568 100644
--- a/easy-es-annotation/pom.xml
+++ b/easy-es-annotation/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.easy-es</groupId>
         <artifactId>easy-es-parent</artifactId>
-        <version>2.0.0-beta1</version>
+        <version>2.0.0-beta2</version>
         <relativePath>../easy-es-parent</relativePath>
     </parent>
 
diff --git a/easy-es-boot-starter/pom.xml b/easy-es-boot-starter/pom.xml
index 9082897e..7a671ba1 100644
--- a/easy-es-boot-starter/pom.xml
+++ b/easy-es-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easy-es-parent</artifactId>
         <groupId>cn.easy-es</groupId>
-        <version>2.0.0-beta1</version>
+        <version>2.0.0-beta2</version>
         <relativePath>../easy-es-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperScannerRegister.java b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperScannerRegister.java
index 9cfb927d..de9854ec 100644
--- a/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperScannerRegister.java
+++ b/easy-es-boot-starter/src/main/java/cn/easyes/starter/register/MapperScannerRegister.java
@@ -56,7 +56,18 @@ public class MapperScannerRegister implements ImportBeanDefinitionRegistrar, Res
                     "\"`-0-0-'\"`-0-0-'\"`-0-0-'\"`-0-0-'\"`-0-0-'\"`-0-0-'\"`-0-0-'\n" +
                     "------------------------------------------------------>"
             );
-            System.out.println(":: version   :: " + versionStr + "                                 >");
+
+            // 版本长度并不固定,比如beta版,所以需要特殊处理
+            int width = 38;
+            int blank = width - versionStr.length();
+            StringBuilder sb = new StringBuilder();
+            sb.append(":: version   :: ")
+                    .append(versionStr);
+            for (int i = 0; i < blank; i++) {
+                sb.append(" ");
+            }
+            sb.append(">");
+            System.out.println(sb);
             System.out.println(":: home      :: https://easy-es.cn/                   >");
             System.out.println(":: community :: https://dromara.org/                  >");
             System.out.println(":: wechat    :: 252645816, add and become muscle man! >");
@@ -88,4 +99,8 @@ public class MapperScannerRegister implements ImportBeanDefinitionRegistrar, Res
     public void setEnvironment(Environment environment) {
         this.environment = environment;
     }
+
+    public static void main(String[] args) {
+        System.out.println("252645816, add and become muscle man! >".length());
+    }
 }
diff --git a/easy-es-common/pom.xml b/easy-es-common/pom.xml
index 3a0ed34a..3eca77c2 100644
--- a/easy-es-common/pom.xml
+++ b/easy-es-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.easy-es</groupId>
         <artifactId>easy-es-parent</artifactId>
-        <version>2.0.0-beta1</version>
+        <version>2.0.0-beta2</version>
         <relativePath>../easy-es-parent</relativePath>
     </parent>
 
diff --git a/easy-es-common/src/main/java/cn/easyes/common/constants/BaseEsConstants.java b/easy-es-common/src/main/java/cn/easyes/common/constants/BaseEsConstants.java
index 5d395171..c3d0ae70 100644
--- a/easy-es-common/src/main/java/cn/easyes/common/constants/BaseEsConstants.java
+++ b/easy-es-common/src/main/java/cn/easyes/common/constants/BaseEsConstants.java
@@ -55,6 +55,10 @@ public interface BaseEsConstants {
      * 冒号
      */
     String COLON = ":";
+    /**
+     * 百分号
+     */
+    String PERCENT_SIGN = "%";
     /**
      * ee内置es分布式锁索引名称
      */
diff --git a/easy-es-common/src/main/java/cn/easyes/common/utils/EEVersionUtils.java b/easy-es-common/src/main/java/cn/easyes/common/utils/EEVersionUtils.java
index e0fed19c..fba62ed9 100644
--- a/easy-es-common/src/main/java/cn/easyes/common/utils/EEVersionUtils.java
+++ b/easy-es-common/src/main/java/cn/easyes/common/utils/EEVersionUtils.java
@@ -33,7 +33,7 @@ public class EEVersionUtils {
      */
     public static <T> String getJarVersion(Class<T> objectClass) {
         return Optional.ofNullable(objectClass.getPackage().getImplementationVersion()).
-                orElse(UNKNOWN);
+                orElse("UNKNOWN");
     }
 
     /**
diff --git a/easy-es-core/pom.xml b/easy-es-core/pom.xml
index b80a2f3d..c3a71356 100644
--- a/easy-es-core/pom.xml
+++ b/easy-es-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.easy-es</groupId>
         <artifactId>easy-es-parent</artifactId>
-        <version>2.0.0-beta1</version>
+        <version>2.0.0-beta2</version>
         <relativePath>../easy-es-parent</relativePath>
     </parent>
 
diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/select/LambdaEsQueryWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/select/LambdaEsQueryWrapper.java
index c37986a5..b1853c42 100644
--- a/easy-es-core/src/main/java/cn/easyes/core/conditions/select/LambdaEsQueryWrapper.java
+++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/select/LambdaEsQueryWrapper.java
@@ -7,6 +7,7 @@ import cn.easyes.core.biz.Param;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Stack;
 
 /**
  * 查询Lambda表达式
@@ -31,14 +32,14 @@ public class LambdaEsQueryWrapper<T> extends AbstractLambdaQueryWrapper<T, Lambd
     }
 
     LambdaEsQueryWrapper(T entity, int level, String parentId, EsQueryTypeEnum pervQueryType, LinkedList<Param> paramList,
-                         LinkedList<String> parentIdQueue, LinkedList<EsQueryTypeEnum> prevQueryTypeQueue,
+                         Stack<String> parentIdStack, LinkedList<EsQueryTypeEnum> prevQueryTypeQueue,
                          List<BaseSortParam> baseSortParams, List<AggregationParam> aggregationParamList) {
         super.setEntity(entity);
         this.level = level;
         this.parentId = parentId;
         this.prevQueryType = pervQueryType;
         this.paramQueue = paramList;
-        this.parentIdQueue = parentIdQueue;
+        this.parentIdStack = parentIdStack;
         this.prevQueryTypeQueue = prevQueryTypeQueue;
         this.baseSortParams = baseSortParams;
         this.aggregationParamList = aggregationParamList;
@@ -46,7 +47,7 @@ public class LambdaEsQueryWrapper<T> extends AbstractLambdaQueryWrapper<T, Lambd
 
     @Override
     protected LambdaEsQueryWrapper<T> instance() {
-        return new LambdaEsQueryWrapper<>(entity, level, parentId, prevQueryType, paramQueue, parentIdQueue, prevQueryTypeQueue, baseSortParams, aggregationParamList);
+        return new LambdaEsQueryWrapper<>(entity, level, parentId, prevQueryType, paramQueue, parentIdStack, prevQueryTypeQueue, baseSortParams, aggregationParamList);
     }
 
 }
diff --git a/easy-es-core/src/main/java/cn/easyes/core/conditions/update/LambdaEsUpdateWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/conditions/update/LambdaEsUpdateWrapper.java
index c5785569..fb6993f0 100644
--- a/easy-es-core/src/main/java/cn/easyes/core/conditions/update/LambdaEsUpdateWrapper.java
+++ b/easy-es-core/src/main/java/cn/easyes/core/conditions/update/LambdaEsUpdateWrapper.java
@@ -9,6 +9,7 @@ import cn.easyes.core.conditions.function.Update;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Stack;
 
 /**
  * 更新Lambda表达式
@@ -33,20 +34,20 @@ public class LambdaEsUpdateWrapper<T> extends AbstractLambdaUpdateWrapper<T, Lam
     }
 
     LambdaEsUpdateWrapper(T entity, int level, String parentId, EsQueryTypeEnum pervQueryType, LinkedList<Param> paramQueue,
-                          LinkedList<String> parentIdQueue, LinkedList<EsQueryTypeEnum> prevQueryTypeQueue, List<EsUpdateParam> updateParamList) {
+                          Stack<String> parentIdStack, LinkedList<EsQueryTypeEnum> prevQueryTypeQueue, List<EsUpdateParam> updateParamList) {
         super.setEntity(entity);
         this.level = level;
         this.parentId = parentId;
         this.prevQueryType = pervQueryType;
         this.paramQueue = paramQueue;
-        this.parentIdQueue = parentIdQueue;
+        this.parentIdStack = parentIdStack;
         this.prevQueryTypeQueue = prevQueryTypeQueue;
         this.updateParamList = updateParamList;
     }
 
     @Override
     protected LambdaEsUpdateWrapper<T> instance() {
-        return new LambdaEsUpdateWrapper<>(entity, level, parentId, prevQueryType, paramQueue, parentIdQueue, prevQueryTypeQueue, updateParamList);
+        return new LambdaEsUpdateWrapper<>(entity, level, parentId, prevQueryType, paramQueue, parentIdStack, prevQueryTypeQueue, updateParamList);
     }
 
 }
diff --git a/easy-es-core/src/main/java/cn/easyes/core/core/AbstractWrapper.java b/easy-es-core/src/main/java/cn/easyes/core/core/AbstractWrapper.java
index 413a41aa..54b73b43 100644
--- a/easy-es-core/src/main/java/cn/easyes/core/core/AbstractWrapper.java
+++ b/easy-es-core/src/main/java/cn/easyes/core/core/AbstractWrapper.java
@@ -53,9 +53,9 @@ public abstract class AbstractWrapper<T, R, Children extends AbstractWrapper<T,
      */
     protected EsQueryTypeEnum prevQueryType;
     /**
-     * 队列 存放父id
+     * 栈 存放父id
      */
-    protected LinkedList<String> parentIdQueue;
+    protected Stack<String> parentIdStack;
     /**
      * 队列 存放上一节点类型
      */
@@ -92,7 +92,7 @@ public abstract class AbstractWrapper<T, R, Children extends AbstractWrapper<T,
         aggregationParamList = new ArrayList<>();
         paramQueue = new LinkedList<>();
         prevQueryType = NESTED_AND;
-        parentIdQueue = new LinkedList<>();
+        parentIdStack = new Stack<>();
         prevQueryTypeQueue = new LinkedList<>();
     }
 
@@ -709,17 +709,22 @@ public abstract class AbstractWrapper<T, R, Children extends AbstractWrapper<T,
 
         paramQueue.add(param);
         this.parentId = param.getId();
-        parentIdQueue.push(parentId);
+        parentIdStack.push(parentId);
         level++;
         consumer.accept(instance());
         // 深度优先在consumer条件消费完后会来执行这里 此时parentId需要重置 至于为什么,比较烧脑 可断点打在consumer前后观察一波
         level--;
-        if (!parentIdQueue.isEmpty()) {
-            this.parentId = parentIdQueue.pollLast();
-        }
-        if (level == 0) {
-            // 仙人板板 根节点
-            this.parentId = null;
+        if (!parentIdStack.isEmpty()) {
+            // 丢弃栈顶 当前id
+            parentIdStack.pop();
+
+            if (parentIdStack.isEmpty()) {
+                // 仙人板板 根节点
+                parentId = null;
+            } else {
+                // 非根节点 取其上一节点id作为爸爸id
+                this.parentId = parentIdStack.peek();
+            }
         }
     }
 
diff --git a/easy-es-core/src/main/java/cn/easyes/core/core/BaseEsMapperImpl.java b/easy-es-core/src/main/java/cn/easyes/core/core/BaseEsMapperImpl.java
index 062c72b5..4aa41391 100644
--- a/easy-es-core/src/main/java/cn/easyes/core/core/BaseEsMapperImpl.java
+++ b/easy-es-core/src/main/java/cn/easyes/core/core/BaseEsMapperImpl.java
@@ -1066,11 +1066,11 @@ public class BaseEsMapperImpl<T> implements BaseEsMapper<T> {
         for (int i = 0; i < sortValues.length; i++) {
             Object sortValue = sortValues[i];
             if (!(sortValue instanceof Double)) {
-                return;
+                continue;
             }
             double distance = (double) sortValue;
             if (Double.isNaN(distance)) {
-                return;
+                continue;
             }
             Integer distanceDecimalPlaces = entityInfo.getDistanceDecimalPlaces().get(i);
             if (distanceDecimalPlaces > ZERO) {
diff --git a/easy-es-core/src/main/java/cn/easyes/core/core/WrapperProcessor.java b/easy-es-core/src/main/java/cn/easyes/core/core/WrapperProcessor.java
index 4ffc54fc..0ae29b9a 100644
--- a/easy-es-core/src/main/java/cn/easyes/core/core/WrapperProcessor.java
+++ b/easy-es-core/src/main/java/cn/easyes/core/core/WrapperProcessor.java
@@ -1,5 +1,6 @@
 package cn.easyes.core.core;
 
+import cn.easyes.common.constants.BaseEsConstants;
 import cn.easyes.common.enums.AggregationTypeEnum;
 import cn.easyes.common.enums.EsQueryTypeEnum;
 import cn.easyes.common.utils.*;
@@ -125,7 +126,7 @@ public class WrapperProcessor {
                 break;
             case MULTI_MATCH:
                 String[] realFields = getRealFields(param.getColumns(), mappingColumnMap);
-                queryBuilder = QueryBuilders.multiMatchQuery(param.getVal(), realFields).operator((Operator) param.getExt1()).minimumShouldMatch(String.valueOf(param.getExt2()));
+                queryBuilder = QueryBuilders.multiMatchQuery(param.getVal(), realFields).operator((Operator) param.getExt1()).minimumShouldMatch(param.getExt2() + PERCENT_SIGN);
                 setBool(bool, queryBuilder, param.getPrevQueryType());
                 break;
             case MATCH_ALL:
diff --git a/easy-es-extension/pom.xml b/easy-es-extension/pom.xml
index 0e1dab2f..71874923 100644
--- a/easy-es-extension/pom.xml
+++ b/easy-es-extension/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.easy-es</groupId>
         <artifactId>easy-es-parent</artifactId>
-        <version>2.0.0-beta1</version>
+        <version>2.0.0-beta2</version>
         <relativePath>../easy-es-parent</relativePath>
     </parent>
 
diff --git a/easy-es-parent/pom.xml b/easy-es-parent/pom.xml
index a50893fd..33d11410 100644
--- a/easy-es-parent/pom.xml
+++ b/easy-es-parent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.easy-es</groupId>
     <artifactId>easy-es-parent</artifactId>
-    <version>2.0.0-beta1</version>
+    <version>2.0.0-beta2</version>
 
     <name>easy-es-parent</name>
     <description>easy use for elastic search</description>
diff --git a/easy-es-sample/pom.xml b/easy-es-sample/pom.xml
index c6b30b84..bccb4578 100644
--- a/easy-es-sample/pom.xml
+++ b/easy-es-sample/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <artifactId>easy-es</artifactId>
         <groupId>cn.easy-es</groupId>
-        <version>2.0.0-beta1</version>
+        <version>2.0.0-beta2</version>
     </parent>
 
     <properties>
diff --git a/easy-es-test/pom.xml b/easy-es-test/pom.xml
index b9556416..67c2ee49 100644
--- a/easy-es-test/pom.xml
+++ b/easy-es-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>easy-es</artifactId>
         <groupId>cn.easy-es</groupId>
-        <version>2.0.0-beta1</version>
+        <version>2.0.0-beta2</version>
     </parent>
 
     <artifactId>easy-es-test</artifactId>
diff --git a/easy-es-test/src/test/java/cn/easyes/test/index/IndexTest.java b/easy-es-test/src/test/java/cn/easyes/test/index/IndexTest.java
index ffcf392d..a4133573 100644
--- a/easy-es-test/src/test/java/cn/easyes/test/index/IndexTest.java
+++ b/easy-es-test/src/test/java/cn/easyes/test/index/IndexTest.java
@@ -38,7 +38,8 @@ public class IndexTest {
     @Test
     public void testCreateIndexByEntity() {
         // 绝大多数场景推荐使用 简单至上
-        documentMapper.createIndex();
+        boolean ok = documentMapper.createIndex();
+        Assertions.assertTrue(ok);
     }
 
     /**
diff --git a/pom.xml b/pom.xml
index e41faae6..4f76685c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.easy-es</groupId>
     <artifactId>easy-es</artifactId>
-    <version>2.0.0-beta1</version>
+    <version>2.0.0-beta2</version>
 
     <name>easy-es</name>
     <description>easy use for elastic search</description>