Merge remote-tracking branch 'origin/master'

apps/examination/exam/models.py

@@ -113,7 +113,7 @@ class ExamLog(models.Model):
     multiple_answer_count = models.IntegerField(verbose_name=u'多选题答对数', default=0, editable=False)
     fill_answer_count = models.IntegerField(verbose_name=u'填空题答对数', default=0, editable=False)
     judgment_answer_count = models.IntegerField(verbose_name=u'判断题答对数', default=0, editable=False)
-    delete = models.BooleanField(verbose_name=u'删除', default=False, editable=False)
+    delete = models.BooleanField(verbose_name=u'删除', db_column='is_delete', default=False, editable=False)
 
     class Meta:
         db_table = "exam_log"

uis/dist/css/app.3c9aeb10.css

@@ -1 +0,0 @@
-body{margin:0;font-family:Arial Negreta,Arial Normal,Arial}@font-face{font-family:iconfont;src:url(//at.alicdn.com/t/font_2724689_mtterbh58wm.woff2?t=1631789608637) format("woff2"),url(//at.alicdn.com/t/font_2724689_mtterbh58wm.woff?t=1631789608637) format("woff"),url(//at.alicdn.com/t/font_2724689_mtterbh58wm.ttf?t=1631789608637) format("truetype")}.iconfont{font-family:iconfont!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-zhanghao:before{content:"\e68d"}.icon-mima:before{content:"\e767"}.icon-kaoshijilu:before{content:"\e70f"}.icon-xiti:before{content:"\e62a"}.icon-cuotiji:before{content:"\e613"}.icon-monikaoshi:before{content:"\e67d"}.icon-zhengshikaoshi:before{content:"\e61f"}.icon-shuben:before{content:"\e612"}.icon-about:before{content:"\e610"}.icon-gantantishi:before{content:"\e64f"}