Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/xycxedu/controller/ExamPlanController.java

@@ -73,7 +73,7 @@ public class ExamPlanController {
                 .select(ExamPlan::getId)
                 .selectAs(BaseSemester::getName, ExamPlanPageVo::getSemesterName)
                 .select(ExamPlan.class,x -> VoToColumnUtil.fieldsToColumns(ExamPlanPageVo.class).contains(x.getProperty()));
-        IPage<ExamPlan> page = examPlanService.page(ConventPage.getPage(dto), queryWrapper);
+        IPage<ExamPlanPageVo> page = examPlanService.selectJoinListPage(ConventPage.getPage(dto), ExamPlanPageVo.class, queryWrapper);
         PageOutput<ExamPlanPageVo> pageOutput = ConventPage.getPageOutput(page, ExamPlanPageVo.class);
         for (ExamPlanPageVo record : pageOutput.getList()) {
             String[] split = record.getMilexamids().split(",");