Merge remote-tracking branch 'origin/master'

zengh

2021-09-10 3b1bba4cae03694d1364115b9cd539bee066ce7e

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java

@@ -26,6 +26,14 @@
   List<ExamScoreVO> selectExamScorePage(IPage page, @Param("examScore") ExamScoreVO examScore);

   /**
    * 自定义分页
    *
    * @param page  分页
    * @return
    */
   List<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction);

   /**
    * 自定义分页-模拟考试
    *
    * @param page  分页