Merge remote-tracking branch 'origin/master'

yn147

2023-04-12 f0f58829c5c8dd9b249f594526f01fa957cbdd59

 src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java

@@ -181,8 +181,8 @@
//                "culturalClassroomRes", chineseLanguageClassRes,
//                "culturalChinaRes", culturalChinaRes);
        return CollectionUtils.newObjectMap(
                "culturalClassroomRes",CollectionUtils.newObjectMap("subjectId",culturalChinaId.get(0),"data",chineseLanguageClassRes),
                "culturalChinaRes",CollectionUtils.newObjectMap("subjectId",chineseLanguageClassId.get(0),"data",culturalChinaRes)
                "culturalClassroomRes",CollectionUtils.newObjectMap("data",chineseLanguageClassRes),
                "culturalChinaRes",CollectionUtils.newObjectMap("data",culturalChinaRes)
        );
    }