diff --git a/pom.xml b/pom.xml
index e4585e9..afb79cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,11 +96,6 @@
                             <artifactId>lombok</artifactId>
                             <version>1.18.36</version>
                         </path>
-                        <path>
-                            <groupId>org.hibernate</groupId>
-                            <artifactId>hibernate-jpamodelgen</artifactId>
-                            <version>6.6.8.Final</version>
-                        </path>
                         <path>
                             <groupId>io.github.openfeign.querydsl</groupId>
                             <artifactId>querydsl-apt</artifactId>
diff --git a/src/main/java/com/lanyuanxiaoyao/service/template/entity/IdOnlyEntity.java b/src/main/java/com/lanyuanxiaoyao/service/template/entity/IdOnlyEntity.java
index e6a594e..c46c3e0 100644
--- a/src/main/java/com/lanyuanxiaoyao/service/template/entity/IdOnlyEntity.java
+++ b/src/main/java/com/lanyuanxiaoyao/service/template/entity/IdOnlyEntity.java
@@ -7,6 +7,7 @@ import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
 import org.hibernate.annotations.Comment;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
@@ -33,6 +34,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Getter
 @Setter
 @ToString
+@FieldNameConstants
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 public class IdOnlyEntity {
diff --git a/src/main/java/com/lanyuanxiaoyao/service/template/entity/SimpleEntity.java b/src/main/java/com/lanyuanxiaoyao/service/template/entity/SimpleEntity.java
index e895bb7..7a78b09 100644
--- a/src/main/java/com/lanyuanxiaoyao/service/template/entity/SimpleEntity.java
+++ b/src/main/java/com/lanyuanxiaoyao/service/template/entity/SimpleEntity.java
@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
 import org.hibernate.annotations.Comment;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
@@ -34,6 +35,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Getter
 @Setter
 @ToString(callSuper = true)
+@FieldNameConstants
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 public class SimpleEntity extends IdOnlyEntity {
diff --git a/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java b/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java
index a1b3ae3..8aa0e16 100644
--- a/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java
+++ b/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java
@@ -1,6 +1,7 @@
 package com.lanyuanxiaoyao.service.template.service;
 
 import com.lanyuanxiaoyao.service.template.controller.Query;
+import com.lanyuanxiaoyao.service.template.entity.IdOnlyEntity;
 import com.lanyuanxiaoyao.service.template.entity.SimpleEntity;
 import com.lanyuanxiaoyao.service.template.helper.ObjectHelper;
 import com.lanyuanxiaoyao.service.template.repository.SimpleRepository;
@@ -172,7 +173,7 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
         return repository.findAll(
                 (root, query, builder) -> {
                     var predicates = listPredicate(root, query, builder);
-                    predicates.add(builder.in(root.get("id")).value(ids));
+                    predicates.add(builder.in(root.get(IdOnlyEntity.Fields.id)).value(ids));
                     return builder.and(predicates.stream().filter(ObjectHelper::isNotNull).toArray(Predicate[]::new));
                 }
         );
@@ -472,12 +473,12 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
      */
     @Override
     public Page<ENTITY> list(Query listQuery) {
-        var pageRequest = PageRequest.of(DEFAULT_PAGE_INDEX - 1, DEFAULT_PAGE_SIZE, Sort.by("createdTime").descending());
+        var pageRequest = PageRequest.of(DEFAULT_PAGE_INDEX - 1, DEFAULT_PAGE_SIZE, Sort.by(SimpleEntity.Fields.createdTime).descending());
         if (ObjectHelper.isNotNull(listQuery.getPage())) {
             pageRequest = PageRequest.of(
                     ObjectHelper.defaultIfNull(listQuery.getPage().getIndex(), DEFAULT_PAGE_INDEX) - 1,
                     ObjectHelper.defaultIfNull(listQuery.getPage().getSize(), DEFAULT_PAGE_SIZE),
-                    Sort.by("createdTime").descending()
+                    Sort.by(SimpleEntity.Fields.createdTime).descending()
             );
         }
         return repository.findAll(
@@ -507,7 +508,7 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
         return repository.findOne(
                 (root, query, builder) -> {
                     var predicates = listPredicate(root, query, builder);
-                    predicates.add(builder.equal(root.get("id"), id));
+                    predicates.add(builder.equal(root.get(IdOnlyEntity.Fields.id), id));
                     return builder.and(predicates.stream().filter(ObjectHelper::isNotNull).toArray(Predicate[]::new));
                 }
         );
diff --git a/src/test/java/com/lanyuanxiaoyao/service/template/entity/Company.java b/src/test/java/com/lanyuanxiaoyao/service/template/entity/Company.java
index e593ede..39adbd3 100644
--- a/src/test/java/com/lanyuanxiaoyao/service/template/entity/Company.java
+++ b/src/test/java/com/lanyuanxiaoyao/service/template/entity/Company.java
@@ -8,6 +8,7 @@ import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -15,6 +16,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Setter
 @Getter
 @ToString(callSuper = true)
+@FieldNameConstants
 @Entity
 @DynamicUpdate
 @EntityListeners(AuditingEntityListener.class)
diff --git a/src/test/java/com/lanyuanxiaoyao/service/template/entity/Employee.java b/src/test/java/com/lanyuanxiaoyao/service/template/entity/Employee.java
index 4fa6b67..f2a5f2e 100644
--- a/src/test/java/com/lanyuanxiaoyao/service/template/entity/Employee.java
+++ b/src/test/java/com/lanyuanxiaoyao/service/template/entity/Employee.java
@@ -15,6 +15,7 @@ import jakarta.persistence.NamedEntityGraph;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -22,6 +23,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Setter
 @Getter
 @ToString(callSuper = true)
+@FieldNameConstants
 @Entity
 @DynamicUpdate
 @EntityListeners(AuditingEntityListener.class)