Merge remote-tracking branch 'origin/master'

apps/api/staff/exam/views.py

@@ -128,6 +128,7 @@ class ExamLogViewSet(CustomModelViewSet):
                     question = detail.question
                     question_data = {
                         'id': detail.id,
+                        'question': question.id,
                         'title': question.title,
                         'next_type': question.type,  # 下一题习题类别
                         'next_number': detail.order + 1,  # 下下一题序号，

apps/api/staff/mock/views.py

@@ -142,6 +142,7 @@ class ExamLogViewSet(CustomModelViewSet):
                     question = detail.question
                     question_data = {
                         'id': detail.id,
+                        'question': question.id,
                         'title': question.title,
                         'next_type': question.type,  # 下一题习题类别
                         'next_number': detail.order + 1,  # 下下一题序号，

apps/examination/examquestion/models.py

@@ -95,7 +95,7 @@ class ExamQuestionFeedback(models.Model):
 
     main = models.ForeignKey(ExamQuestion, verbose_name=u"试题", on_delete=models.PROTECT)
     type = models.PositiveSmallIntegerField(choices=TYPE_CHOICES, verbose_name=u"错误类型")
-    desc = models.TextField(verbose_name=u"错误描述")
+    desc = models.TextField(verbose_name=u"错误描述", null=True, blank=True)
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'反馈人',related_name='exam_question_feedback_user', editable=False, on_delete=models.PROTECT)
     create_time = models.DateTimeField(verbose_name=u"反馈时间", default=timezone.now, editable=False)
     status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u'处理状态', default=UNTREATED)