diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java
index 28fefa99..1dd50d7d 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/FlexEnumTypeHandler.java
@@ -45,7 +45,7 @@ public class FlexEnumTypeHandler<E extends Enum<E>> extends BaseTypeHandler<E> {
 
     @Override
     public E getNullableResult(ResultSet rs, String columnName) throws SQLException {
-        Object value = rs.getObject(columnName, enumWrapper.getEnumPropertyType());
+        Object value = rs.getObject(columnName, enumWrapper.getPropertyType());
         if (null == value && rs.wasNull()) {
             return null;
         }
@@ -55,7 +55,7 @@ public class FlexEnumTypeHandler<E extends Enum<E>> extends BaseTypeHandler<E> {
 
     @Override
     public E getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-        Object value = rs.getObject(columnIndex, enumWrapper.getEnumPropertyType());
+        Object value = rs.getObject(columnIndex, enumWrapper.getPropertyType());
         if (null == value && rs.wasNull()) {
             return null;
         }
@@ -65,7 +65,7 @@ public class FlexEnumTypeHandler<E extends Enum<E>> extends BaseTypeHandler<E> {
 
     @Override
     public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-        Object value = cs.getObject(columnIndex, enumWrapper.getEnumPropertyType());
+        Object value = cs.getObject(columnIndex, enumWrapper.getPropertyType());
         if (null == value && cs.wasNull()) {
             return null;
         }
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java
index 6dfd2cf9..58b0931e 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/EnumWrapper.java
@@ -29,13 +29,13 @@ public class EnumWrapper<E extends Enum<E>> {
 
     private static final Map<Class, EnumWrapper> cache = new ConcurrentHashMap<>();
 
-    private Class<?> enumClass;
+    private boolean hasEnumValueAnnotation = false;
 
-    private Class<?> enumPropertyType;
+    private Class<?> enumClass;
     private E[] enums;
     private Field property;
-    private Method getter;
-    private boolean hasEnumValueAnnotation = false;
+    private Class<?> propertyType;
+    private Method getterMethod;
 
     public static <R extends Enum<R>> EnumWrapper<R> of(Class<?> enumClass) {
         return MapUtil.computeIfAbsent(cache, enumClass, EnumWrapper::new);
@@ -43,6 +43,7 @@ public class EnumWrapper<E extends Enum<E>> {
 
     public EnumWrapper(Class<E> enumClass) {
         this.enumClass = enumClass;
+        this.enums = enumClass.getEnumConstants();
 
         Field enumValueField = ClassUtil.getFirstField(enumClass, field -> field.getAnnotation(EnumValue.class) != null);
         if (enumValueField != null) {
@@ -50,24 +51,23 @@ public class EnumWrapper<E extends Enum<E>> {
         }
 
         if (hasEnumValueAnnotation) {
-            String fieldGetterName = "get" + StringUtil.firstCharToUpperCase(enumValueField.getName());
+            String getterMethodName = "get" + StringUtil.firstCharToUpperCase(enumValueField.getName());
 
-            Method getterMethod = ClassUtil.getFirstMethod(enumClass, method -> {
+            Method getter = ClassUtil.getFirstMethod(enumClass, method -> {
                 String methodName = method.getName();
-                return methodName.equals(fieldGetterName) && Modifier.isPublic(method.getModifiers());
+                return methodName.equals(getterMethodName) && Modifier.isPublic(method.getModifiers());
             });
 
-            enumPropertyType = ClassUtil.getWrapType(enumValueField.getType());
-            enums = enumClass.getEnumConstants();
+            propertyType = ClassUtil.getWrapType(enumValueField.getType());
 
-            if (getterMethod == null) {
+            if (getter == null) {
                 if (Modifier.isPublic(enumValueField.getModifiers())) {
                     property = enumValueField;
                 } else {
-                    throw new IllegalStateException("Can not find \"" + fieldGetterName + "()\" method in enum: " + enumClass.getName());
+                    throw new IllegalStateException("Can not find method \"" + getterMethodName + "()\" in enum: " + enumClass.getName());
                 }
             } else {
-                getter = getterMethod;
+                this.getterMethod = getter;
             }
         }
     }
@@ -75,9 +75,7 @@ public class EnumWrapper<E extends Enum<E>> {
 
     public Object getEnumValue(E object) {
         try {
-            return getter != null
-                    ? getter.invoke(object)
-                    : property.get(object);
+            return getterMethod != null ? getterMethod.invoke(object) : property.get(object);
         } catch (Exception e) {
             throw FlexExceptions.wrap(e);
         }
@@ -93,12 +91,12 @@ public class EnumWrapper<E extends Enum<E>> {
         return null;
     }
 
-    public Class<?> getEnumClass() {
-        return enumClass;
+    public boolean hasEnumValueAnnotation() {
+        return hasEnumValueAnnotation;
     }
 
-    public Class<?> getEnumPropertyType() {
-        return enumPropertyType;
+    public Class<?> getEnumClass() {
+        return enumClass;
     }
 
     public E[] getEnums() {
@@ -109,11 +107,11 @@ public class EnumWrapper<E extends Enum<E>> {
         return property;
     }
 
-    public Method getGetter() {
-        return getter;
+    public Class<?> getPropertyType() {
+        return propertyType;
     }
 
-    public boolean hasEnumValueAnnotation() {
-        return hasEnumValueAnnotation;
+    public Method getGetterMethod() {
+        return getterMethod;
     }
 }