diff --git a/src/main/java/com/peanut/modules/common/entity/ClassEntity.java b/src/main/java/com/peanut/modules/common/entity/ClassEntity.java
index 2911e404..8af66045 100644
--- a/src/main/java/com/peanut/modules/common/entity/ClassEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/ClassEntity.java
@@ -49,6 +49,10 @@ public class ClassEntity {
     private ClassModel classModel;
     @TableField(exist = false)
     private List<Map<String,Object>> classUsers;
+    @TableField(exist = false)
+    private Date examStartTime;
+    @TableField(exist = false)
+    private Date examEndTime;
 
 
 }
diff --git a/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java b/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java
index d8c596a0..b44eed80 100644
--- a/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java
+++ b/src/main/java/com/peanut/modules/common/entity/UserCertificateLabel.java
@@ -27,5 +27,7 @@ public class UserCertificateLabel {
 
     @TableField(exist = false)
     private List<UserCertificateLabel> children;
+    @TableField(exist = false)
+    private List<UserCertificate> userCertificates;
 
 }
diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
index 1610fdd2..e53f2aa0 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
@@ -215,7 +215,10 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             }else {
                 classEntity.setCreateUser(user);
             }
-            classEntity.setClassModel(classModelDao.selectById(classEntity.getModelId()));
+            ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
+            classEntity.setClassModel(classModel);
+            classEntity.setExamStartTime(classEntity.getStartTime()==null?null:DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()));
+            classEntity.setExamEndTime(classEntity.getStartTime()==null?null:DateUtils.addDateDays(classEntity.getStartTime(),classModel.getDays()+classModel.getExamDays()));
             MPJLambdaWrapper<ClassUser> userWrapper = new MPJLambdaWrapper<>();
             userWrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,ClassUser::getUserId);
             userWrapper.select("t.role,t.user_id as userId,t1.tel,t1.name,t1.nickname");