diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptAbstractWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java
index 5223765..71d340d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt;
+package com.github.yulichang.extension.apt;
 
 import com.baomidou.mybatisplus.annotation.OrderBy;
 import com.baomidou.mybatisplus.core.conditions.SharedString;
@@ -17,7 +17,7 @@ import com.github.yulichang.toolkit.LogicInfoUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableMap;
 import com.github.yulichang.toolkit.support.ColumnCache;
-import com.github.yulichang.wrapper.apt.interfaces.QueryJoin;
+import com.github.yulichang.extension.apt.interfaces.QueryJoin;
 import com.github.yulichang.wrapper.interfaces.MFunction;
 import com.github.yulichang.wrapper.segments.SelectCache;
 import lombok.Getter;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptQueryWrapper.java
similarity index 95%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptQueryWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptQueryWrapper.java
index 34a246b..00feb9c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptQueryWrapper.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt;
+package com.github.yulichang.extension.apt;
 
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -8,11 +8,13 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.apt.BaseColumn;
 import com.github.yulichang.apt.Column;
 import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.extension.apt.toolkit.AptWrapperUtils;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
-import com.github.yulichang.wrapper.apt.interfaces.Query;
-import com.github.yulichang.wrapper.apt.interfaces.QueryLabel;
+import com.github.yulichang.extension.apt.interfaces.Query;
+import com.github.yulichang.extension.apt.interfaces.QueryLabel;
 import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import com.github.yulichang.wrapper.interfaces.SelectWrapper;
@@ -185,7 +187,7 @@ public class AptQueryWrapper<T> extends AptAbstractWrapper<T, AptQueryWrapper<T>
      */
     @Override
     public AptQueryWrapper<T> selectAll() {
-        Assert.notNull(getEntityClass(), "使用 JoinWrappers.apt(clazz) 或者 new JoinAptQueryWrapper<>(BaseColum)");
+        Assert.notNull(getEntityClass(), "使用 AptWrappers.query(clazz) 或者 new JoinAptQueryWrapper<>(BaseColum)");
         return selectAll(getBaseColumn());
     }
 
@@ -221,7 +223,7 @@ public class AptQueryWrapper<T> extends AptAbstractWrapper<T, AptQueryWrapper<T>
      * @since 1.4.8
      */
     public <U> AptQueryWrapper<T> union(BaseColumn<U> baseColumn, Consumer<AptQueryWrapper<U>> consumer) {
-        AptQueryWrapper<U> unionWrapper = JoinWrappers.apt(baseColumn);
+        AptQueryWrapper<U> unionWrapper = AptWrappers.query(baseColumn);
         addCustomWrapper(unionWrapper);
         consumer.accept(unionWrapper);
 
@@ -243,7 +245,7 @@ public class AptQueryWrapper<T> extends AptAbstractWrapper<T, AptQueryWrapper<T>
      * @since 1.4.8
      */
     public <U> AptQueryWrapper<T> unionAll(BaseColumn<U> baseColumn, Consumer<AptQueryWrapper<U>> consumer) {
-        AptQueryWrapper<U> unionWrapper = JoinWrappers.apt(baseColumn);
+        AptQueryWrapper<U> unionWrapper = AptWrappers.query(baseColumn);
         addCustomWrapper(unionWrapper);
         consumer.accept(unionWrapper);
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/JoinAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/JoinAbstractWrapper.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/JoinAbstractWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/JoinAbstractWrapper.java
index d9a95a5..5e3e5a5 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/JoinAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/JoinAbstractWrapper.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt;
+package com.github.yulichang.extension.apt;
 
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
 import com.baomidou.mybatisplus.core.conditions.SharedString;
@@ -18,9 +18,9 @@ import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
-import com.github.yulichang.wrapper.apt.interfaces.CompareIfExists;
-import com.github.yulichang.wrapper.apt.interfaces.Func;
-import com.github.yulichang.wrapper.apt.interfaces.OnCompare;
+import com.github.yulichang.extension.apt.interfaces.CompareIfExists;
+import com.github.yulichang.extension.apt.interfaces.Func;
+import com.github.yulichang.extension.apt.interfaces.OnCompare;
 import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.CompareStrIfExists;
 import com.github.yulichang.wrapper.interfaces.DoSomething;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Compare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Compare.java
similarity index 98%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Compare.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Compare.java
index 5512ff6..f1e625a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Compare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Compare.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.github.yulichang.apt.Column;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/CompareIfExists.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/CompareIfExists.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/CompareIfExists.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/CompareIfExists.java
index 6dffb8e..0110b2b 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/CompareIfExists.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/CompareIfExists.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.github.yulichang.apt.Column;
 import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Func.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Func.java
similarity index 98%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Func.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Func.java
index 85ff15b..d83baf9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Func.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Func.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.github.yulichang.apt.Column;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/FuncLambda.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/FuncLambda.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/FuncLambda.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/FuncLambda.java
index b888a26..f8e1c40 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/FuncLambda.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/FuncLambda.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/OnCompare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/OnCompare.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/OnCompare.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/OnCompare.java
index 54d8d27..c4f9760 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/OnCompare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/OnCompare.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.github.yulichang.apt.Column;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Query.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Query.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Query.java
index 1022380..51083ec 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/Query.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/QueryJoin.java
similarity index 95%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryJoin.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/QueryJoin.java
index 61e2535..db2b375 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/QueryJoin.java
@@ -1,11 +1,11 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.github.yulichang.apt.BaseColumn;
 import com.github.yulichang.apt.Column;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Constant;
-import com.github.yulichang.wrapper.apt.AptAbstractWrapper;
+import com.github.yulichang.extension.apt.AptAbstractWrapper;
 import com.github.yulichang.wrapper.interfaces.MFunction;
 
 /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/QueryLabel.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryLabel.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/QueryLabel.java
index 411cb6c..cc1aa75 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/QueryLabel.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.interfaces;
+package com.github.yulichang.extension.apt.interfaces;
 
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
@@ -6,8 +6,8 @@ import com.github.yulichang.apt.BaseColumn;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.support.FieldCache;
-import com.github.yulichang.wrapper.apt.resultmap.MybatisLabel;
-import com.github.yulichang.wrapper.apt.resultmap.MybatisLabelFree;
+import com.github.yulichang.extension.apt.resultmap.MybatisLabel;
+import com.github.yulichang.extension.apt.resultmap.MybatisLabelFree;
 import com.github.yulichang.wrapper.interfaces.MFunction;
 import com.github.yulichang.wrapper.resultmap.Label;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/MybatisLabel.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabel.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/MybatisLabel.java
index 1e68ee9..d2aa6eb 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/MybatisLabel.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.resultmap;
+package com.github.yulichang.extension.apt.resultmap;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabelFree.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/MybatisLabelFree.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabelFree.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/MybatisLabelFree.java
index 97320ad..88b893c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabelFree.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/MybatisLabelFree.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.resultmap;
+package com.github.yulichang.extension.apt.resultmap;
 
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/Result.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/Result.java
similarity index 98%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/Result.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/Result.java
index ee9a820..73aec3c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/Result.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/Result.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.wrapper.apt.resultmap;
+package com.github.yulichang.extension.apt.resultmap;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/AptWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java
similarity index 96%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/AptWrapperUtils.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java
index c35df92..109452a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/AptWrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.toolkit;
+package com.github.yulichang.extension.apt.toolkit;
 
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.adapter.AdapterHelper;
+import com.github.yulichang.toolkit.LogicInfoUtils;
+import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.AptQueryWrapper;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrappers.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrappers.java
new file mode 100644
index 0000000..e5f582d
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrappers.java
@@ -0,0 +1,26 @@
+package com.github.yulichang.extension.apt.toolkit;
+
+import com.github.yulichang.apt.BaseColumn;
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+
+/**
+ * @author yulichang
+ * @since 1.5.0
+ */
+@SuppressWarnings("unused")
+public class AptWrappers {
+
+    /**
+     * AptWrappers.query(User.class)
+     */
+    public static <T> AptQueryWrapper<T> query(BaseColumn<T> baseColumn) {
+        return new AptQueryWrapper<>(baseColumn);
+    }
+
+    /**
+     * AptWrappers.query("t", User.class)
+     */
+    public static <T> AptQueryWrapper<T> query(BaseColumn<T> baseColumn, T entity) {
+        return new AptQueryWrapper<>(baseColumn, entity);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java
index 3e63f0d..d34535e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt;
+package com.github.yulichang.extension.kt;
 
 import com.baomidou.mybatisplus.annotation.OrderBy;
 import com.baomidou.mybatisplus.core.conditions.SharedString;
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
-import com.github.yulichang.kt.interfaces.QueryJoin;
+import com.github.yulichang.extension.kt.interfaces.QueryJoin;
 import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractWrapper.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractWrapper.java
index a101017..264f04c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractWrapper.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt;
+package com.github.yulichang.extension.kt;
 
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
 import com.baomidou.mybatisplus.core.conditions.SharedString;
@@ -12,10 +12,10 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.kt.interfaces.CompareIfExists;
-import com.github.yulichang.kt.interfaces.Func;
-import com.github.yulichang.kt.interfaces.OnCompare;
-import com.github.yulichang.kt.segments.FuncArgs;
+import com.github.yulichang.extension.kt.interfaces.CompareIfExists;
+import com.github.yulichang.extension.kt.interfaces.Func;
+import com.github.yulichang.extension.kt.interfaces.OnCompare;
+import com.github.yulichang.extension.kt.segments.FuncArgs;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtDeleteJoinWrapper.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtDeleteJoinWrapper.java
index 960e073..2a2e703 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtDeleteJoinWrapper.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt;
+package com.github.yulichang.extension.kt;
 
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtLambdaWrapper.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtLambdaWrapper.java
index 8437ffd..652785e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtLambdaWrapper.java
@@ -1,12 +1,14 @@
-package com.github.yulichang.kt;
+package com.github.yulichang.extension.kt;
 
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.kt.interfaces.Query;
-import com.github.yulichang.kt.interfaces.QueryLabel;
+import com.github.yulichang.extension.kt.interfaces.Query;
+import com.github.yulichang.extension.kt.interfaces.QueryLabel;
+import com.github.yulichang.extension.kt.toolkit.KtWrapperUtils;
+import com.github.yulichang.extension.kt.toolkit.KtWrappers;
 import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
 import com.github.yulichang.wrapper.interfaces.Chain;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java
similarity index 98%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java
index 2fd6a8f..7c0a239 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt;
+package com.github.yulichang.extension.kt;
 
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.AdapterHelper;
-import com.github.yulichang.kt.interfaces.Update;
+import com.github.yulichang.extension.kt.interfaces.Update;
 import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.ReflectionKit;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Compare.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Compare.java
index 4726244..cf43a4d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Compare.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import kotlin.reflect.KProperty;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/CompareIfExists.java
similarity index 98%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/CompareIfExists.java
index 9a72541..686269a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/CompareIfExists.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import kotlin.reflect.KProperty;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Func.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Func.java
index 2b74cf9..6dbd518 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Func.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import kotlin.reflect.KProperty;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/OnCompare.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/OnCompare.java
index 430eaa8..cf683e9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/OnCompare.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import kotlin.reflect.KProperty;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Query.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Query.java
index 43d923f..bf02124 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Query.java
@@ -1,9 +1,9 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.github.yulichang.kt.segments.FuncArgs;
+import com.github.yulichang.extension.kt.segments.FuncArgs;
 import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/QueryJoin.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/QueryJoin.java
index 086a7bf..72a6fe7 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/QueryJoin.java
@@ -1,7 +1,7 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import com.github.yulichang.interfaces.MPJBaseJoin;
-import com.github.yulichang.kt.KtAbstractLambdaWrapper;
+import com.github.yulichang.extension.kt.KtAbstractLambdaWrapper;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.wrapper.interfaces.MFunction;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/QueryLabel.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/QueryLabel.java
index f2d00b8..cfd550c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/QueryLabel.java
@@ -1,9 +1,9 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.github.yulichang.kt.resultmap.MybatisLabel;
-import com.github.yulichang.kt.resultmap.MybatisLabelFree;
+import com.github.yulichang.extension.kt.resultmap.MybatisLabel;
+import com.github.yulichang.extension.kt.resultmap.MybatisLabelFree;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.support.FieldCache;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Update.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Update.java
index c86f718..3970f7a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/interfaces/Update.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.interfaces;
+package com.github.yulichang.extension.kt.interfaces;
 
 import kotlin.reflect.KProperty;
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/MybatisLabel.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/MybatisLabel.java
index a11c497..cb2cd25 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/MybatisLabel.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.resultmap;
+package com.github.yulichang.extension.kt.resultmap;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabelFree.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/MybatisLabelFree.java
similarity index 99%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabelFree.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/MybatisLabelFree.java
index 4b3877d..9de9c81 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabelFree.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/MybatisLabelFree.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.resultmap;
+package com.github.yulichang.extension.kt.resultmap;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/Result.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/Result.java
similarity index 98%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/Result.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/Result.java
index 83b9896..aba7b79 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/Result.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/Result.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.resultmap;
+package com.github.yulichang.extension.kt.resultmap;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.toolkit.KtUtils;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/segments/FuncArgs.java
similarity index 91%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/segments/FuncArgs.java
index 646eec8..e3eb05f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/segments/FuncArgs.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.kt.segments;
+package com.github.yulichang.extension.kt.segments;
 
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.wrapper.segments.SelectFunc;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java
similarity index 96%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java
index 707f4e7..b333da7 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.toolkit;
+package com.github.yulichang.extension.kt.toolkit;
 
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.adapter.AdapterHelper;
-import com.github.yulichang.kt.KtLambdaWrapper;
+import com.github.yulichang.extension.kt.KtLambdaWrapper;
+import com.github.yulichang.toolkit.LogicInfoUtils;
+import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
 
 import java.util.Objects;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrappers.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrappers.java
similarity index 89%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrappers.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrappers.java
index 05e580e..f6adb17 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrappers.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrappers.java
@@ -1,8 +1,8 @@
-package com.github.yulichang.toolkit;
+package com.github.yulichang.extension.kt.toolkit;
 
-import com.github.yulichang.kt.KtDeleteJoinWrapper;
-import com.github.yulichang.kt.KtLambdaWrapper;
-import com.github.yulichang.kt.KtUpdateJoinWrapper;
+import com.github.yulichang.extension.kt.KtDeleteJoinWrapper;
+import com.github.yulichang.extension.kt.KtLambdaWrapper;
+import com.github.yulichang.extension.kt.KtUpdateJoinWrapper;
 
 /**
  * @author yulichang
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java
index a1dd705..35895ae 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java
@@ -1,11 +1,9 @@
 package com.github.yulichang.toolkit;
 
-import com.github.yulichang.apt.BaseColumn;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.github.yulichang.wrapper.DeleteJoinWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.github.yulichang.wrapper.UpdateJoinWrapper;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 
 /**
  * @author yulichang
@@ -104,18 +102,4 @@ public class JoinWrappers {
     public static <T> UpdateJoinWrapper<T> update(String alias, Class<T> clazz) {
         return new UpdateJoinWrapper<>(clazz, alias);
     }
-
-    /**
-     * JoinWrappers.apt(User.class)
-     */
-    public static <T> AptQueryWrapper<T> apt(BaseColumn<T> baseColumn) {
-        return new AptQueryWrapper<>(baseColumn);
-    }
-
-    /**
-     * JoinWrappers.apt("t", User.class)
-     */
-    public static <T> AptQueryWrapper<T> apt(BaseColumn<T> baseColumn, T entity) {
-        return new AptQueryWrapper<>(baseColumn, entity);
-    }
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java
index 74cbca8..47785cf 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.dto.AddressDTO;
 import com.github.yulichang.test.join.dto.UserDTO;
 import com.github.yulichang.test.join.dto.UserTenantDTO;
@@ -15,8 +17,6 @@ import com.github.yulichang.test.join.entity.apt.*;
 import com.github.yulichang.test.join.mapper.*;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -68,14 +68,14 @@ class AptWrapperTest {
 
         UserTenantDOCol ut = USERTENANTDO;
 
-        AptQueryWrapper<UserTenantDO> lambda = JoinWrappers.apt(ut)
+        AptQueryWrapper<UserTenantDO> lambda = AptWrappers.query(ut)
                 .selectAsClass(ut, UserTenantDTO.class);
         List<UserTenantDO> list = userTenantMapper.selectJoinList(UserTenantDO.class, lambda);
         assert list.size() == 5 && list.get(0).getIdea() != null;
 
 
         ThreadLocalUtils.set("SELECT t.tenant_id, t.user_id, t.id FROM user_tenant t WHERE t.tenant_id = 1");
-        AptQueryWrapper<UserTenantDO> lambda1 = JoinWrappers.apt(ut)
+        AptQueryWrapper<UserTenantDO> lambda1 = AptWrappers.query(ut)
                 .selectAsClass(ut, UserTenantDescDTO.class);
         List<UserTenantDO> list1 = userTenantMapper.selectJoinList(UserTenantDO.class, lambda1);
         assert list1.size() == 5 && list1.get(0).getIdea() != null;
@@ -84,7 +84,7 @@ class AptWrapperTest {
     @Test
     void testSimple() {
         UserTenantDOCol ut = USERTENANTDO;
-        AptQueryWrapper<UserTenantDO> lambda = JoinWrappers.apt(ut);
+        AptQueryWrapper<UserTenantDO> lambda = AptWrappers.query(ut);
         lambda.selectAs(ut.idea, UserTenantDO::getIdea);
         List<UserTenantDO> list = userTenantMapper.selectList(lambda);
 
@@ -696,7 +696,7 @@ class AptWrapperTest {
 
         Page<UserDTO> page = new Page<>(1, 10);
         page.setSearchCount(false);
-        IPage<UserDTO> iPage = userMapper.selectJoinPage(page, UserDTO.class, JoinWrappers.apt(u)
+        IPage<UserDTO> iPage = userMapper.selectJoinPage(page, UserDTO.class, AptWrappers.query(u)
                 .selectAll()
                 .select(addr.address)
                 .select(ar.province)
@@ -738,7 +738,7 @@ class AptWrapperTest {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
 
-        IPage<UserDTO> page = userMapper.selectJoinPage(new Page<>(1, 10), UserDTO.class, JoinWrappers.apt(u)
+        IPage<UserDTO> page = userMapper.selectJoinPage(new Page<>(1, 10), UserDTO.class, AptWrappers.query(u)
                 .selectAll()
                 .select(addr.address)
                 .leftJoin(addr, on -> on
@@ -761,7 +761,7 @@ class AptWrapperTest {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectSum(u.id)
                 .selectMax(u.id, UserDTO::getHeadImg)
                 .leftJoin(addr, addr.userId, u.id);
@@ -792,7 +792,7 @@ class AptWrapperTest {
     void test7() {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
-        List<Map<String, Object>> list = userMapper.selectJoinMaps(JoinWrappers.apt(u)
+        List<Map<String, Object>> list = userMapper.selectJoinMaps(AptWrappers.query(u)
                 .selectAll()
                 .select(addr.address)
                 .leftJoin(addr, addr.userId, u.id));
@@ -982,7 +982,7 @@ class AptWrapperTest {
         AddressDOCol addr = AddressDOCol.build();
         AreaDOCol ar = AreaDOCol.build();
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .logicDelToOn()
                 .selectAll()
                 .selectCollection(addr, UserDTO::getAddressList, ad -> ad
@@ -1004,7 +1004,7 @@ class AptWrapperTest {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
         AreaDOCol ar = AreaDOCol.build();
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .logicDelToOn()
                 .selectAll()
                 .selectCollection(UserDTO::getAddressList, ad -> ad
@@ -1031,7 +1031,7 @@ class AptWrapperTest {
         UserDOCol u = UserDOCol.build();
         UserDOCol u1 = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
-        AptQueryWrapper<AddressDO> wrapper = JoinWrappers.apt(addr)
+        AptQueryWrapper<AddressDO> wrapper = AptWrappers.query(addr)
                 .selectAll()
                 .leftJoin(u, u.addressId, addr.id)
                 .leftJoin(u1, u1.pid, u.id);
@@ -1047,7 +1047,7 @@ class AptWrapperTest {
         ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t1.id = t1.id)");
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr, addr.userId, u.id)
                 .eq(addr.id, addr.id);
@@ -1064,7 +1064,7 @@ class AptWrapperTest {
                 "LEFT JOIN address aaa ON (aaa.user_id = t.id) WHERE t.del=false AND aaa.del=false AND (aaa.id = t.id AND aaa.id = aaa.id)");
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build("aaa");
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr, addr.userId, u.id)
                 .eq(addr.id, u.id)
@@ -1086,7 +1086,7 @@ class AptWrapperTest {
                     "SELECT id,user_id,name FROM order_t t");
         }
         OrderDOCol o = OrderDOCol.build();
-        AptQueryWrapper<OrderDO> wrapper = JoinWrappers.apt(o);
+        AptQueryWrapper<OrderDO> wrapper = AptWrappers.query(o);
         List<OrderDO> list = wrapper.list();
 
         if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3") >= 0) {
@@ -1099,7 +1099,7 @@ class AptWrapperTest {
 
         UserDOCol u = UserDOCol.build();
         OrderDOCol o1 = OrderDOCol.build();
-        AptQueryWrapper<OrderDO> w = JoinWrappers.apt(o1)
+        AptQueryWrapper<OrderDO> w = AptWrappers.query(o1)
                 .selectAll()
                 .selectAs(u.name, OrderDO::getUserName)
                 .leftJoin(u, u.id, o1.userId);
@@ -1113,7 +1113,7 @@ class AptWrapperTest {
     void checkOrderBy() {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr, addr.userId, u.id)
                 .le(u.id, 100)
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ApplyFuncTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ApplyFuncTest.java
index eca826d..4822a45 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ApplyFuncTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ApplyFuncTest.java
@@ -1,11 +1,11 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.AddressDOCol;
 import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -32,7 +32,7 @@ public class ApplyFuncTest {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
 
-        List<UserDO> list = JoinWrappers.apt(u)
+        List<UserDO> list = AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr, addr.userId, u.id)
                 .applyFunc("concat(%s,%s,{0}) is not null", arg -> arg.accept(u.id, addr.userId), "12")
@@ -50,7 +50,7 @@ public class ApplyFuncTest {
         UserDOCol u1 = UserDOCol.build();
         AddressDOCol addr1 = AddressDOCol.build();
 
-        List<UserDO> list1 = JoinWrappers.apt(u1)
+        List<UserDO> list1 = AptWrappers.query(u1)
                 .selectAll(u1, u1.id)
                 .leftJoin(addr1, addr1.userId, u1.id)
                 .applyFunc("concat(%s,%s,{0}) is not null", arg -> arg.accept(u1.id, addr1.userId), "12")
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/AroundTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/AroundTest.java
index 2457735..5381ef7 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/AroundTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/AroundTest.java
@@ -1,11 +1,11 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -24,7 +24,7 @@ public class AroundTest {
         ThreadLocalUtils.set("SELECT * FROM (SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, " +
                 "t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false) tmp");
         UserDOCol u = UserDOCol.build();
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .around("select * from (", ") tmp");
         wrapper.list().forEach(System.out::println);
     }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ChineseFieldTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ChineseFieldTest.java
index 4deaf3f..5dc3c56 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ChineseFieldTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/ChineseFieldTest.java
@@ -1,8 +1,8 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserTenantaDO;
 import com.github.yulichang.test.join.entity.apt.UserTenantaDOCol;
-import com.github.yulichang.toolkit.JoinWrappers;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -14,7 +14,7 @@ public class ChineseFieldTest {
     @Test
     void chineseField() {
         UserTenantaDOCol ut = UserTenantaDOCol.build();
-        List<UserTenantaDO> list = JoinWrappers.apt(ut).list();
+        List<UserTenantaDO> list = AptWrappers.query(ut).list();
         assert list.get(0).getDetail() != null;
         list.forEach(System.out::println);
     }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/CustomWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/CustomWrapperTest.java
index 4f3d828..dae6ba1 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/CustomWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/CustomWrapperTest.java
@@ -8,7 +8,7 @@ import com.github.yulichang.test.join.mapper.UserMapper;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
 import com.github.yulichang.toolkit.Ref;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/EqSqlTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/EqSqlTest.java
index 3760f13..c50d08d 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/EqSqlTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/EqSqlTest.java
@@ -1,9 +1,9 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -22,12 +22,12 @@ public class EqSqlTest {
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id = (SELECT id FROM `user` WHERE id = 1))");
         UserDOCol u = UserDOCol.build();
-        JoinWrappers.apt(u).eqSql(u.id, "select id from `user` where id = 1").list();
+        AptWrappers.query(u).eqSql(u.id, "select id from `user` where id = 1").list();
 
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id = (SELECT id FROM `user` WHERE id = 1))");
         UserDOCol u1 = UserDOCol.build();
-        JoinWrappers.apt(u1).eqSql("t.id", "select id from `user` where id = 1").list();
+        AptWrappers.query(u1).eqSql("t.id", "select id from `user` where id = 1").list();
     }
 
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldAliasTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldAliasTest.java
index 508f1cc..b1c5655 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldAliasTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldAliasTest.java
@@ -1,5 +1,7 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.UserTenantDO;
 import com.github.yulichang.test.join.entity.apt.AddressDOCol;
@@ -8,8 +10,6 @@ import com.github.yulichang.test.join.entity.apt.UserTenantDOCol;
 import com.github.yulichang.test.join.mapper.UserMapper;
 import com.github.yulichang.test.join.mapper.UserTenantMapper;
 import com.github.yulichang.test.util.Reset;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@ public class FieldAliasTest {
     void fieldAlias() {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
-        List<UserDO> list = userMapper.selectList(JoinWrappers.apt(u)
+        List<UserDO> list = userMapper.selectList(AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr, addr.userId, u.id));
 
@@ -50,7 +50,7 @@ public class FieldAliasTest {
     void fieldAlias1() {
         UserTenantDOCol ut = UserTenantDOCol.build();
         UserDOCol u = UserDOCol.build();
-        AptQueryWrapper<UserTenantDO> wrapper = JoinWrappers.apt(ut)
+        AptQueryWrapper<UserTenantDO> wrapper = AptWrappers.query(ut)
                 .selectAll()
                 .leftJoin(u, u.id, ut.uuid);
         List<UserTenantDO> list = userTenantMapper.selectList(wrapper);
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldNameTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldNameTest.java
index 268cba9..3e9aad3 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldNameTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/FieldNameTest.java
@@ -1,12 +1,12 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.dto.AreaDTO;
 import com.github.yulichang.test.join.entity.AreaDO;
 import com.github.yulichang.test.join.entity.apt.AreaDOCol;
 import com.github.yulichang.test.join.entity.apt.UserDtoCol;
 import com.github.yulichang.test.join.mapper.AreaMapper;
 import com.github.yulichang.test.util.Reset;
-import com.github.yulichang.toolkit.JoinWrappers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +30,7 @@ public class FieldNameTest {
     void testFieldName() {
         AreaDOCol ar = AreaDOCol.build();
         UserDtoCol ud = UserDtoCol.build();
-        List<AreaDO> list = areaMapper.selectJoinList(AreaDO.class, JoinWrappers.apt(ar)
+        List<AreaDO> list = areaMapper.selectJoinList(AreaDO.class, AptWrappers.query(ar)
                 .select(ar.Postcode)
                 .leftJoin(ud, ud.id, ar.id));
 
@@ -41,7 +41,7 @@ public class FieldNameTest {
     void testFieldName1() {
         AreaDOCol ar = AreaDOCol.build();
         UserDtoCol ud = UserDtoCol.build();
-        List<AreaDTO> list = areaMapper.selectJoinList(AreaDTO.class, JoinWrappers.apt(ar)
+        List<AreaDTO> list = areaMapper.selectJoinList(AreaDTO.class, AptWrappers.query(ar)
                 .selectAs(ar.Postcode, AreaDTO::getPostcode)
                 .leftJoin(ud, ud.id, ar.id));
 
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/IfExistsTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/IfExistsTest.java
index 47ad28b..52b2e26 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/IfExistsTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/IfExistsTest.java
@@ -1,12 +1,12 @@
 package com.github.yulichang.test.join.apt.unit;
 
 import com.github.yulichang.config.enums.IfExistsEnum;
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -45,7 +45,7 @@ public class IfExistsTest {
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
                 "WHERE t.del = false AND (t.id = ? AND t.head_img = ? AND t.`name` = ?)");
         UserDOCol u = UserDOCol.build();
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .eqIfExists(u.id, 1)
                 .eqIfExists(u.pid, null)
@@ -59,7 +59,7 @@ public class IfExistsTest {
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
                 "WHERE t.del = false AND (t.id = ? AND t.`name` = ?)");
         UserDOCol u1 = UserDOCol.build();
-        AptQueryWrapper<UserDO> wrapper1 = JoinWrappers.apt(u1)
+        AptQueryWrapper<UserDO> wrapper1 = AptWrappers.query(u1)
                 .selectAll()
                 .setIfExists(IfExistsEnum.NOT_BLANK)
                 .eqIfExists(u1.id, 1)
@@ -74,7 +74,7 @@ public class IfExistsTest {
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
                 "WHERE t.del = false AND (t.id = ? AND t.`name` = ? AND t.head_img = ? AND t.`name` = ?)");
         UserDOCol u2 = UserDOCol.build();
-        AptQueryWrapper<UserDO> wrapper2 = JoinWrappers.apt(u2)
+        AptQueryWrapper<UserDO> wrapper2 = AptWrappers.query(u2)
                 .selectAll()
                 .setIfExists(o -> true)
                 .eqIfExists(u2.id, 1)
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/NotLikeLeftRightTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/NotLikeLeftRightTest.java
index a0294e9..834f406 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/NotLikeLeftRightTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/NotLikeLeftRightTest.java
@@ -1,11 +1,11 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -25,7 +25,7 @@ public class NotLikeLeftRightTest {
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.`name` NOT LIKE ?)");
         UserDOCol u = UserDOCol.build();
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .notLikeLeft(u.name, "aa");
         List<UserDO> list = wrapper.list();
@@ -34,7 +34,7 @@ public class NotLikeLeftRightTest {
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.`name` NOT LIKE ?)");
         UserDOCol u1 = UserDOCol.build();
-        AptQueryWrapper<UserDO> wrapper1 = JoinWrappers.apt(u1)
+        AptQueryWrapper<UserDO> wrapper1 = AptWrappers.query(u1)
                 .selectAll()
                 .notLikeRight(u1.name, "aa");
         List<UserDO> list1 = wrapper1.list();
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/OrderByTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/OrderByTest.java
index 09a45c3..45e6673 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/OrderByTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/OrderByTest.java
@@ -1,6 +1,8 @@
 package com.github.yulichang.test.join.apt.unit;
 
 import com.github.yulichang.apt.Column;
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.dto.UserDTO;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.AddressDOCol;
@@ -8,8 +10,6 @@ import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.EnabledIfConfig;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -34,7 +34,7 @@ public class OrderByTest {
         UserDOCol u = UserDOCol.build();
         List<Column> columList = Arrays.asList(u.id, u.name, u.pid);
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .eq(u.id, 1)
                 .orderByAsc(columList);
@@ -51,7 +51,7 @@ public class OrderByTest {
         UserDOCol u = UserDOCol.build();
         List<Column> columList = Arrays.asList(u.id, u.name, u.pid);
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .eq(u.id, 1)
                 .groupBy(columList);
@@ -67,7 +67,7 @@ public class OrderByTest {
         UserDOCol u = UserDOCol.build();
         AddressDOCol addr =  AddressDOCol.build();
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .selectAs(addr.id, UserDTO::getAddress)
                 .leftJoin(addr, addr.userId, u.id)
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/SelectSubTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/SelectSubTest.java
index 5092c52..58f04dc 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/SelectSubTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/SelectSubTest.java
@@ -1,5 +1,7 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.AddressDOCol;
 import com.github.yulichang.test.join.entity.apt.AreaDOCol;
@@ -7,8 +9,6 @@ import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.EnabledIfConfig;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -35,7 +35,7 @@ public class SelectSubTest {
         UserDOCol sb2 = UserDOCol.build();
         AddressDOCol addr = AddressDOCol.build();
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectSub(sb, w -> w.select(sb.id)
                         .eq(sb.id, u.id)
                         .eq(sb.id, 2)
@@ -53,7 +53,7 @@ public class SelectSubTest {
         AreaDOCol area = AreaDOCol.build();
 
         ThreadLocalUtils.set("SELECT (SELECT st.id FROM area st WHERE st.del = false AND (st.id = t1.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
-        AptQueryWrapper<UserDO> wrapper1 = JoinWrappers.apt(u1)
+        AptQueryWrapper<UserDO> wrapper1 = AptWrappers.query(u1)
                 .selectSub(area, w -> w.select(area.id)
                         .eq(area.id, addr1.id)
                         .last("limit 1"), UserDO::getId)
@@ -69,7 +69,7 @@ public class SelectSubTest {
         AddressDOCol addr = AddressDOCol.build();
         AreaDOCol ar = AreaDOCol.build();
 
-        AptQueryWrapper<UserDO> wrapper1 = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper1 = AptWrappers.query(u)
                 .selectSub(ar, w -> w.select(ar.id)
                         .eq(ar.id, addr.id)
                         .setTableName(t -> "`" + t + "`")
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/StringColumTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/StringColumTest.java
index e0a54bf..c70d3fa 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/StringColumTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/StringColumTest.java
@@ -6,7 +6,7 @@ import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.join.mapper.UserMapper;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.AptQueryWrapper;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/TableAliasTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/TableAliasTest.java
index c33f633..e52323e 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/TableAliasTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/TableAliasTest.java
@@ -1,5 +1,7 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.AddressDOCol;
 import com.github.yulichang.test.join.entity.apt.AreaDOCol;
@@ -8,8 +10,6 @@ import com.github.yulichang.test.join.mapper.UserMapper;
 import com.github.yulichang.test.util.EnabledIfConfig;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +43,7 @@ public class TableAliasTest {
         AddressDOCol addr2 = AddressDOCol.build("addr2");
         AreaDOCol area1 = AreaDOCol.build("area1");
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr1, addr1.id, u.addressId)
                 .leftJoin(addr2, addr2.id, u.addressId2)
@@ -68,7 +68,7 @@ public class TableAliasTest {
         AddressDOCol addr2 = AddressDOCol.build("addr2");
         AreaDOCol area1 = AreaDOCol.build("area1");
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr1, addr1.id, u.addressId)
                 .leftJoin(addr2, addr2.id, u.addressId2)
@@ -95,7 +95,7 @@ public class TableAliasTest {
         AddressDOCol addr2 = AddressDOCol.build("addr2");
         AreaDOCol area1 = AreaDOCol.build("area1");
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .selectAll()
                 .leftJoin(addr1, addr1.id, u.addressId)
                 .leftJoin(addr2, addr2.id, u.addressId2)
@@ -117,7 +117,7 @@ public class TableAliasTest {
 
         UserDO userDO = new UserDO();
         userDO.setName("aaa");
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u, userDO);
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u, userDO);
         wrapper.list();
     }
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/UnionTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/UnionTest.java
index e9b65c8..83949db 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/UnionTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/unit/UnionTest.java
@@ -1,5 +1,7 @@
 package com.github.yulichang.test.join.apt.unit;
 
+import com.github.yulichang.extension.apt.AptQueryWrapper;
+import com.github.yulichang.extension.apt.toolkit.AptWrappers;
 import com.github.yulichang.test.join.entity.AreaDO;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.join.entity.apt.AddressDOCol;
@@ -7,8 +9,6 @@ import com.github.yulichang.test.join.entity.apt.AreaDOCol;
 import com.github.yulichang.test.join.entity.apt.UserDOCol;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.apt.AptQueryWrapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -33,7 +33,7 @@ public class UnionTest {
         AreaDOCol area = AreaDOCol.build();
         AreaDOCol areaSb = AreaDOCol.build();
 
-        AptQueryWrapper<UserDO> wrapper = JoinWrappers.apt(u)
+        AptQueryWrapper<UserDO> wrapper = AptWrappers.query(u)
                 .select(u.id)
                 .eq(u.id, 1)
                 .unionAll(addr, union -> union