Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/mapper/mapping/ExamPaperMapper.xml

@@ -409,6 +409,7 @@
     SELECT
       tep.id,
       tep.name,
+      tep.paper_type paperType,
       su.ID userId,
       cc.ID hourId,
       cc.NAME hourName,
@@ -417,7 +418,7 @@
       ch.COURSE_ID courseId,
       ci.COURSE_NAME courseName,
       co.GRADES_ID gradesId,
-      tepa.status,
+      nvl(tepa.status,0) status,
       tepa.id answerId
     FROM
       t_exam_paper tep

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/vo/ExamPaperVo.java

@@ -54,6 +54,7 @@ public class ExamPaperVo {
      */
     private Integer answerId;
 
+    private Integer paperType;
 
 
 }