进行版本合并和部分细节微调

AES-front/src/views/user/exam-list/index.vue

@@ -154,7 +154,7 @@ const columns = [
 ]
 
 
-const queryByPage = async (currentPage) => {
+const queryByPage = async (currentPage) => {//进入页面加载逻辑
   loading.value = true
   //先清理所有定时器
   for (let key in countdownControllers) {

AES/src/main/java/com/example/aes/problem/controller/ProblemController.java

@@ -4,13 +4,13 @@ package com.example.aes.problem.controller;
 import com.example.aes.global.model.DecodeToken;
 import com.example.aes.global.model.RespBean;
 import com.example.aes.problem.model.*;
+import com.example.aes.problem.model.DataGrid;
 import com.example.aes.problem.service.ProblemServiceI;
 import com.example.aes.user.model.*;
 import com.example.aes.user.service.ClassesServiceI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import com.example.aes.user.model.DataGrid;
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.event.ListDataEvent;
 import java.util.ArrayList;

AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java

@@ -9,7 +9,6 @@ import com.example.aes.problem.service.ProblemServiceI;
 import com.example.aes.user.dao.AdminusersDaoI;
 import com.example.aes.user.model.Classstudents;
 import com.example.aes.user.model.Course;
-import com.example.aes.user.model.DataGrid;
 import com.example.aes.user.model.PMCourse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java

@@ -3,6 +3,7 @@ package com.example.aes.problem.service;
 
 
 import com.example.aes.problem.model.*;
+import com.example.aes.problem.model.DataGrid;
 import com.example.aes.user.model.*;
 
 import java.util.List;