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

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -451,7 +451,6 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             .eq(AssessmentPlanQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
             .eq(AssessmentPlanQuestion::getAssessmentTemplatePlanId, id)
         );
-        Map<Long, String> questionTypeMap = questionList.stream().collect(Collectors.toMap(AssessmentPlanQuestion::getAssessmentTemplatePlanId, AssessmentPlanQuestion::getType));
 
         //循环大题
         List<OneQuestionVo> oneList = new ArrayList<>();

src/main/java/com/xjrsoft/module/base/controller/BaseClassCourseController.java

@@ -101,6 +101,7 @@ public class BaseClassCourseController {
         baseClassCourseMPJLambdaWrapper
                 .disableSubLogicDel()
                 .select(BaseClassCourse::getCourseId)
+                .select(BaseClassCourse::getId)
                 .selectAs(BaseClass::getName, BaseClassCourseListVo::getClassIdCn)
                 .selectAs(BaseCourseSubject::getName, BaseClassCourseListVo::getCourseIdCn)
                 .selectAs(Textbook::getBookName, BaseClassCourseListVo::getTextbookIdCn)