Merge branch 'zcwy1108-llf' into dev1107-121

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
This commit is contained in:
nisen
2024-11-10 20:34:58 +08:00

View File

@@ -253,6 +253,7 @@ public class StudyCourseApi extends ApiBaseController{
List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
rs.put("contentStudys",items);//学习的内容
}
return success(rs);
}