调整文件目录

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptAbstractWrapper.java → 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.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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/AptQueryWrapper.java → 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.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 final <E> AptQueryWrapper<T> selectAll(BaseColumn<E> baseColumn, Column..
      */
     @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 @@ paramNameSeq, paramNameValuePairs, new MergeSegments(), new SharedString(this.pa
      * @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 <U> AptQueryWrapper<T> union(BaseColumn<U> baseColumn, Consumer<AptQueryW
      * @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);
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/JoinAbstractWrapper.java → 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.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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Compare.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/CompareIfExists.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Func.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/FuncLambda.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/OnCompare.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/Query.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryJoin.java → 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;
 
 /**

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/interfaces/QueryLabel.java → mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/interfaces/QueryLabel.java

@@ -1,13 +1,13 @@
-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;
 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabel.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/MybatisLabelFree.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/apt/resultmap/Result.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/AptWrapperUtils.java → mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java

@@ -1,13 +1,15 @@
-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;
 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;

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);
+    }
+}

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java → 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.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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java → 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.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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java → mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java

@@ -1,12 +1,12 @@
-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;
 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java → 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;
 

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabelFree.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/Result.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java → 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;

mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java → mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java

@@ -1,12 +1,14 @@
-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;
 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;