diff --git a/web/src/main/java/cn/jlw/util/QuestionUtil.java b/web/src/main/java/cn/jlw/util/QuestionUtil.java
index 8f695d89..23df4730 100644
--- a/web/src/main/java/cn/jlw/util/QuestionUtil.java
+++ b/web/src/main/java/cn/jlw/util/QuestionUtil.java
@@ -11,9 +11,7 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static java.util.stream.Collectors.joining;
@@ -90,7 +88,9 @@ public class QuestionUtil {
             v.setOptionLetter(LETTER_RANGE.next());
         });
 
-        return Kv.values();
+        List<QuestionInfo> list = new ArrayList<>(Kv.values());
+        Collections.shuffle(list);
+        return list;
     }
 
     /**
@@ -170,4 +170,5 @@ public class QuestionUtil {
          */
         private ResourcesQuestionTypeEnum questionType;
     }
+
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestionImport.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestionImport.java
index 3f028241..7c025baf 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestionImport.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestionImport.java
@@ -1,9 +1,6 @@
 package com.ibeetl.jlw.entity;
 
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.ibeetl.admin.core.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import static cn.jlw.util.excel.ExcelUtil.*;
 
@@ -12,13 +9,7 @@ import static cn.jlw.util.excel.ExcelUtil.*;
  * @author lx
  */
 @Data
-@ExcelIgnoreUnannotated
-@EqualsAndHashCode(callSuper=false)
-public class TeacherOpenCourseMergeResourcesQuestionImport extends BaseEntity {
-
-    //ID
-
-    private String teacherOpenCourseMergeResourcesQuestionId ;
+public class TeacherOpenCourseMergeResourcesQuestionImport {
 
     //开课ID
     
@@ -68,18 +59,6 @@ public class TeacherOpenCourseMergeResourcesQuestionImport extends BaseEntity {
 
     private String questionAnalysis ;
 
-    //题目状态 （1上架， 2下架）
-
-    private String questionStatus ;
-
-    //后台用户ID
-
-    private String userId ;
-
-    //组织机构ID
-
-    private String orgId ;
-
     /**
      * 类型转换
      * @param importPojo