diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
index b8a4e26a..ac1b7f1a 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
@@ -41,7 +41,7 @@ public abstract class Model<T extends Model<T>>
      * @return {@code true} 删除成功，{@code false} 删除失败
      */
     public boolean remove() {
-        return SqlUtil.toBool(baseMapper().deleteByQuery(getQueryWrapper()));
+        return SqlUtil.toBool(baseMapper().deleteByQuery(queryWrapper()));
     }
 
     /**
@@ -60,7 +60,7 @@ public abstract class Model<T extends Model<T>>
      * @return {@code true} 更新成功，{@code false} 更新失败
      */
     public boolean update(boolean ignoreNulls) {
-        return SqlUtil.toBool(baseMapper().updateByQuery((T) this, ignoreNulls, getQueryWrapper()));
+        return SqlUtil.toBool(baseMapper().updateByQuery((T) this, ignoreNulls, queryWrapper()));
     }
 
     /**
@@ -69,7 +69,7 @@ public abstract class Model<T extends Model<T>>
      * @return 数据数量
      */
     public long count() {
-        return baseMapper().selectCountByQuery(getQueryWrapper());
+        return baseMapper().selectCountByQuery(queryWrapper());
     }
 
     /**
@@ -87,7 +87,7 @@ public abstract class Model<T extends Model<T>>
      * @return 数据
      */
     public T one() {
-        return baseMapper().selectOneByQuery(getQueryWrapper());
+        return baseMapper().selectOneByQuery(queryWrapper());
     }
 
     /**
@@ -96,7 +96,7 @@ public abstract class Model<T extends Model<T>>
      * @return 数据
      */
     public T oneWithRelations() {
-        return baseMapper().selectOneWithRelationsByQuery(getQueryWrapper().limit(1));
+        return baseMapper().selectOneWithRelationsByQuery(queryWrapper().limit(1));
     }
 
     /**
@@ -123,7 +123,7 @@ public abstract class Model<T extends Model<T>>
      * @return 数据列表
      */
     public List<T> list() {
-        return baseMapper().selectListByQuery(getQueryWrapper());
+        return baseMapper().selectListByQuery(queryWrapper());
     }
 
     /**
@@ -132,7 +132,7 @@ public abstract class Model<T extends Model<T>>
      * @return 数据列表
      */
     public List<T> listWithRelations() {
-        return baseMapper().selectListWithRelationsByQuery(getQueryWrapper());
+        return baseMapper().selectListWithRelationsByQuery(queryWrapper());
     }
 
     /**
@@ -142,7 +142,7 @@ public abstract class Model<T extends Model<T>>
      * @return 分页数据
      */
     public Page<T> page(Page<T> page) {
-        return baseMapper().paginate(page, getQueryWrapper());
+        return baseMapper().paginate(page, queryWrapper());
     }
 
     /**
@@ -152,7 +152,7 @@ public abstract class Model<T extends Model<T>>
      * @return 分页数据
      */
     public Page<T> pageWithRelations(Page<T> page) {
-        return baseMapper().paginateWithRelations(page, getQueryWrapper());
+        return baseMapper().paginateWithRelations(page, queryWrapper());
     }
 
 }
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
index 44721101..cfa2ac2a 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
@@ -42,7 +42,7 @@ public abstract class QueryModel<T extends QueryModel<T>> {
     @Column(ignore = true)
     private QueryWrapper queryWrapper;
 
-    protected QueryWrapper getQueryWrapper() {
+    protected QueryWrapper queryWrapper() {
         if (queryWrapper == null) {
             queryWrapper = QueryWrapper.create();
         }
@@ -54,37 +54,37 @@ public abstract class QueryModel<T extends QueryModel<T>> {
     }
 
     public T select(String... columns) {
-        getQueryWrapper().select(columns);
+        queryWrapper().select(columns);
         return (T) this;
     }
 
     public T select(QueryColumn... queryColumns) {
-        getQueryWrapper().select(queryColumns);
+        queryWrapper().select(queryColumns);
         return (T) this;
     }
 
     public <E> T select(LambdaGetter<E>... columns) {
-        getQueryWrapper().select(columns);
+        queryWrapper().select(columns);
         return (T) this;
     }
 
     public T select(QueryColumn[]... queryColumns) {
-        getQueryWrapper().select(queryColumns);
+        queryWrapper().select(queryColumns);
         return (T) this;
     }
 
     public T where(QueryCondition queryCondition) {
-        getQueryWrapper().where(queryCondition);
+        queryWrapper().where(queryCondition);
         return (T) this;
     }
 
     public T where(String sql) {
-        getQueryWrapper().where(sql);
+        queryWrapper().where(sql);
         return (T) this;
     }
 
     public T where(String sql, Object... params) {
-        getQueryWrapper().where(sql, params);
+        queryWrapper().where(sql, params);
         return (T) this;
     }
 
@@ -93,17 +93,17 @@ public abstract class QueryModel<T extends QueryModel<T>> {
     }
 
     public T and(QueryCondition queryCondition) {
-        getQueryWrapper().and(queryCondition);
+        queryWrapper().and(queryCondition);
         return (T) this;
     }
 
     public T and(String sql) {
-        getQueryWrapper().and(sql);
+        queryWrapper().and(sql);
         return (T) this;
     }
 
     public T and(String sql, Object... params) {
-        getQueryWrapper().and(sql, params);
+        queryWrapper().and(sql, params);
         return (T) this;
     }
 
@@ -112,17 +112,17 @@ public abstract class QueryModel<T extends QueryModel<T>> {
     }
 
     public T or(QueryCondition queryCondition) {
-        getQueryWrapper().or(queryCondition);
+        queryWrapper().or(queryCondition);
         return (T) this;
     }
 
     public T or(String sql) {
-        getQueryWrapper().or(sql);
+        queryWrapper().or(sql);
         return (T) this;
     }
 
     public T or(String sql, Object... params) {
-        getQueryWrapper().or(sql, params);
+        queryWrapper().or(sql, params);
         return (T) this;
     }
 
@@ -323,32 +323,32 @@ public abstract class QueryModel<T extends QueryModel<T>> {
     }
 
     public T groupBy(String... names) {
-        getQueryWrapper().groupBy(names);
+        queryWrapper().groupBy(names);
         return (T) this;
     }
 
     public T groupBy(QueryColumn... columns) {
-        getQueryWrapper().groupBy(columns);
+        queryWrapper().groupBy(columns);
         return (T) this;
     }
 
     public <E> T groupBy(LambdaGetter<E>... columns) {
-        getQueryWrapper().groupBy(columns);
+        queryWrapper().groupBy(columns);
         return (T) this;
     }
 
     public T having(QueryCondition queryCondition) {
-        getQueryWrapper().having(queryCondition);
+        queryWrapper().having(queryCondition);
         return (T) this;
     }
 
     public T orderBy(QueryOrderBy... orderBys) {
-        getQueryWrapper().orderBy(orderBys);
+        queryWrapper().orderBy(orderBys);
         return (T) this;
     }
 
     public T orderBy(String... orderBys) {
-        getQueryWrapper().orderBy(orderBys);
+        queryWrapper().orderBy(orderBys);
         return (T) this;
     }
 
@@ -357,23 +357,23 @@ public abstract class QueryModel<T extends QueryModel<T>> {
     }
 
     public T limit(Integer rows) {
-        getQueryWrapper().limit(rows);
+        queryWrapper().limit(rows);
         return (T) this;
     }
 
     public T offset(Integer offset) {
-        getQueryWrapper().offset(offset);
+        queryWrapper().offset(offset);
         return (T) this;
     }
 
     public T limit(Integer offset, Integer rows) {
-        getQueryWrapper().limit(offset, rows);
+        queryWrapper().limit(offset, rows);
         return (T) this;
     }
 
     protected JoinBuilder<T> joins(String type, QueryTable table, boolean when) {
         Join join = new Join(type, table, when);
-        CPI.addJoin(getQueryWrapper(), join);
+        CPI.addJoin(queryWrapper(), join);
         return new JoinBuilder<>((T) this, join);
     }
 
@@ -385,7 +385,7 @@ public abstract class QueryModel<T extends QueryModel<T>> {
 
     protected JoinBuilder<T> joins(String type, QueryWrapper queryWrapper, boolean when) {
         Join join = new Join(type, queryWrapper, when);
-        CPI.addJoin(getQueryWrapper(), join);
+        CPI.addJoin(queryWrapper(), join);
         return new JoinBuilder<>((T) this, join);
     }
 
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
index 285429d6..c87378c2 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
@@ -44,14 +44,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
 
     public R eq(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.eq(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.eq(value), connector);
         }
         return queryModel;
     }
 
     public <T> R eq(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.eq(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.eq(value, when), connector);
         }
         return queryModel;
     }
@@ -66,14 +66,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
 
     public R ne(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ne(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ne(value), connector);
         }
         return queryModel;
     }
 
     public <T> R ne(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ne(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ne(value, when), connector);
         }
         return queryModel;
     }
@@ -88,56 +88,56 @@ public class WhereBuilder<R extends QueryModel<R>> {
 
     public R like(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.like(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.like(value), connector);
         }
         return queryModel;
     }
 
     public <T> R like(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.like(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.like(value, when), connector);
         }
         return queryModel;
     }
 
     public R likeLeft(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeLeft(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeLeft(value), connector);
         }
         return queryModel;
     }
 
     public <T> R likeLeft(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeLeft(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeLeft(value, when), connector);
         }
         return queryModel;
     }
 
     public R likeRight(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeRight(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeRight(value), connector);
         }
         return queryModel;
     }
 
     public <T> R likeRight(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeRight(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeRight(value, when), connector);
         }
         return queryModel;
     }
 
     public R gt(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.gt(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.gt(value), connector);
         }
         return queryModel;
     }
 
     public <T> R gt(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.gt(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.gt(value, when), connector);
         }
         return queryModel;
     }
@@ -152,14 +152,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
 
     public R ge(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ge(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ge(value), connector);
         }
         return queryModel;
     }
 
     public <T> R ge(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ge(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ge(value, when), connector);
         }
         return queryModel;
     }
@@ -174,14 +174,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
 
     public R lt(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.lt(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.lt(value), connector);
         }
         return queryModel;
     }
 
     public <T> R lt(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.lt(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.lt(value, when), connector);
         }
         return queryModel;
     }
@@ -196,14 +196,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
 
     public R le(Object value) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.le(value), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.le(value), connector);
         }
         return queryModel;
     }
 
     public <T> R le(Object value, Predicate<T> when) {
         if (value != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.le(value, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.le(value, when), connector);
         }
         return queryModel;
     }
@@ -217,28 +217,28 @@ public class WhereBuilder<R extends QueryModel<R>> {
     }
 
     public R isNull() {
-        CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNull(), connector);
+        CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNull(), connector);
         return queryModel;
     }
 
     public <T> R isNull(Predicate<T> when) {
-        CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNull(when), connector);
+        CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNull(when), connector);
         return queryModel;
     }
 
     public R isNotNull() {
-        CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNotNull(), connector);
+        CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNotNull(), connector);
         return queryModel;
     }
 
     public <T> R isNotNull(Predicate<T> when) {
-        CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNotNull(when), connector);
+        CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNotNull(when), connector);
         return queryModel;
     }
 
     public R in(Object... arrays) {
         if (arrays != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(arrays), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(arrays), connector);
         }
         return queryModel;
     }
@@ -246,105 +246,105 @@ public class WhereBuilder<R extends QueryModel<R>> {
     public <T> R in(Object[] arrays, Predicate<T> when) {
         //忽略 QueryWrapper.in("name", null) 的情况
         if (arrays != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(arrays, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(arrays, when), connector);
         }
         return queryModel;
     }
 
     public R in(R queryModel) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(queryModel), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(queryModel), connector);
         }
         return this.queryModel;
     }
 
     public <T> R in(R queryModel, Predicate<T> when) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(queryModel, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(queryModel, when), connector);
         }
         return this.queryModel;
     }
 
     public R in(Collection<?> collection) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(collection), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(collection), connector);
         }
         return queryModel;
     }
 
     public <T> R in(Collection<?> collection, Predicate<T> when) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(collection, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(collection, when), connector);
         }
         return queryModel;
     }
 
     public R notIn(Object... arrays) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(arrays), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(arrays), connector);
         }
         return queryModel;
     }
 
     public <T> R notIn(Object[] arrays, Predicate<T> when) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(arrays, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(arrays, when), connector);
         }
         return queryModel;
     }
 
     public R notIn(Collection<?> collection) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(collection), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(collection), connector);
         }
         return queryModel;
     }
 
     public <T> R notIn(Collection<?> collection, Predicate<T> when) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(collection, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(collection, when), connector);
         }
         return queryModel;
     }
 
     public R notIn(R queryModel) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(queryModel), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(queryModel), connector);
         }
         return this.queryModel;
     }
 
     public <T> R notIn(R queryModel, Predicate<T> when) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(queryModel, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(queryModel, when), connector);
         }
         return this.queryModel;
     }
 
     public R between(Object start, Object end) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.between(start, end), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.between(start, end), connector);
         }
         return queryModel;
     }
 
     public <T> R between(Object start, Object end, Predicate<T> when) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.between(start, end, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.between(start, end, when), connector);
         }
         return queryModel;
     }
 
     public R notBetween(Object start, Object end) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notBetween(start, end), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notBetween(start, end), connector);
         }
         return queryModel;
     }
 
     public <T> R notBetween(Object start, Object end, Predicate<T> when) {
         if (queryModel != null) {
-            CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notBetween(start, end, when), connector);
+            CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notBetween(start, end, when), connector);
         }
         return queryModel;
     }