From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java b/src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java
index a3c5757..76a64a7 100644
--- a/src/main/java/com/qxueyou/scc/portal/homepage/serivce/imp/HomepageService.java
+++ b/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)
);
}
--
Gitblit v1.8.0