Merge remote-tracking branch 'origin/master'

school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbQuestionBankServiceImpl.java

@@ -62,6 +62,8 @@ public class DbQuestionBankServiceImpl implements IDbQuestionBankService {
     @Override
     public TableDataInfo<DbQuestionBankVo> queryPageList(DbQuestionBankBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<DbQuestionBank> lqw = buildQueryWrapper(bo);
+        pageQuery.setOrderByColumn("id");
+        pageQuery.setIsAsc("desc");
         Page<DbQuestionBankVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }

school-paper/src/main/resources/mapper/school-paper/DbErrorListMapper.xml

@@ -58,7 +58,7 @@
         del.question_bank_id AS questionBankId,
         dqbtp.topic AS topic,
         dtprd.answer AS answer,
-        dtprd.correct_answer AS correctAnswer,
+        dqbtp.right_answers AS correctAnswer,
         dqbtp.species AS species
         FROM
         db_error_list AS del