diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java index 9c6ef458..94c8cc07 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java @@ -25,10 +25,15 @@ public class LiteracyCourse extends LiteracySourceCourse implements Serializable private String id; @Column - @ColDefine(type = ColType.VARCHAR, width = 50) + @ColDefine(type = ColType.VARCHAR, width = 32) @Comment("活动ID") private String activityId; + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("子活动ID") + private String courseId; + @Many(field = "courseId") private List courseTimeList; diff --git a/src/main/resources/static/components/plugins/Guava.vue b/src/main/resources/static/components/plugins/Guava.vue index 849e7b16..9d422d18 100644 --- a/src/main/resources/static/components/plugins/Guava.vue +++ b/src/main/resources/static/components/plugins/Guava.vue @@ -16,8 +16,8 @@
- diff --git a/src/main/resources/views/layouts/v4/apps.html b/src/main/resources/views/layouts/v4/apps.html index 0c3e31b1..2ef6c44b 100644 --- a/src/main/resources/views/layouts/v4/apps.html +++ b/src/main/resources/views/layouts/v4/apps.html @@ -524,10 +524,10 @@ layout("/layouts/v4/baseLayout.html"){ // 如果是"推荐应用"分类 if (this.activeCategory === "recommended") { - $.get("/platform/v4/apps/recommended") + $.get("/platform/home/listRecommendApp", { platform: "PC" }) .then((result) => { if (result.code === 0) { - this.applications = result.data.list || [] + this.applications = result.data || [] } else { console.error("获取推荐应用失败:", result.msg) } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js b/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js index cc502807..e9215a5d 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js @@ -157,8 +157,8 @@ const basicForm = { -