From 80246c9dec2958b5e03d535e50f534724512c9fd Mon Sep 17 00:00:00 2001
From: zhonghua <zhonghua>
Date: Mon, 23 Mar 2026 14:09:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=A0=A1=E5=9B=AD=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=92=E8=AF=BE=E3=80=81=E6=95=99=E5=B8=88=E7=AB=AF=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E6=8E=92=E8=AF=BE=E6=B7=BB=E5=8A=A0=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 多套餐时步骤1展示套餐选择器，支持切换套餐后加载对应课程包
- 单套餐时保持原行为，自动选中并展示课程包
- 管理端数据模型已支持一租户多套餐、一套餐多课程

Made-with: Cursor
---
 .../components/CreateScheduleModal.scss       | 20 ++++++
 .../components/CreateScheduleModal.vue        | 52 ++++++++++++++
 .../components/TeacherCreateScheduleModal.vue | 72 +++++++++++++++++++
 3 files changed, 144 insertions(+)

diff --git a/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.scss b/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.scss
index 2b218f9..bb63e4c 100644
--- a/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.scss
+++ b/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.scss
@@ -25,6 +25,26 @@
   }
 }
 
+.collection-selector {
+  margin-bottom: 20px;
+  padding: 16px;
+  background: #FAFAFA;
+  border-radius: 8px;
+
+  .selector-label {
+    font-size: 14px;
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 12px;
+  }
+
+  .collection-radio-group {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+}
+
 .collection-option {
   .collection-name {
     font-weight: 500;
diff --git a/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue b/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue
index 401a885..abe5638 100644
--- a/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue
+++ b/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue
@@ -50,8 +50,22 @@
       <!-- 步骤2: 选择课程包 -->
       <div v-show="currentStep === 1" class="step-panel">
         <h3>选择课程包</h3>
+        <!-- 多套餐时：先选套餐 -->
+        <div v-if="collections.length > 1" class="collection-selector">
+          <div class="selector-label">选择课程套餐</div>
+          <a-radio-group v-model:value="formData.collectionId" button-style="solid" class="collection-radio-group" @change="onCollectionChange">
+            <a-radio-button
+              v-for="col in collections"
+              :key="col.id"
+              :value="col.id as number"
+            >
+              {{ col.name }}
+            </a-radio-button>
+          </a-radio-group>
+        </div>
         <a-spin :spinning="loadingPackages">
         <div v-if="selectedCollection && selectedCollection.packages && selectedCollection.packages.length > 0" class="packages-section">
+          <div v-if="collections.length > 1" class="selector-label" style="margin-bottom: 12px">选择课程包</div>
           <div class="packages-grid">
             <div
               v-for="pkg in selectedCollection.packages"
@@ -428,14 +442,28 @@ const resetForm = () => {
   classTeacherMap.value = {};
 };
 
+<<<<<<< HEAD
 // 加载课程套餐列表（租户可拥有多个套餐）
+=======
+// 加载课程套餐列表；多套餐时展示选择器，单套餐时自动选中并加载课程包
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
 const loadCollections = async () => {
   loadingPackages.value = true;
   try {
     collections.value = await getCourseCollections();
+<<<<<<< HEAD
     // 若仅有一个套餐，自动选中并加载其课程包，提升体验
     if (collections.value.length === 1) {
       await selectCollection(collections.value[0]);
+=======
+    if (collections.value.length > 0) {
+      const first = collections.value[0];
+      formData.collectionId = first.id as number;
+      await loadPackagesForCollection(first.id);
+      if (!first.packages || first.packages.length === 0) {
+        message.warning(collections.value.length > 1 ? '该套餐暂无课程包' : '暂无课程包');
+      }
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
     }
   } catch (error) {
     console.error('❌ 加载课程套餐失败:', error);
@@ -445,13 +473,27 @@ const loadCollections = async () => {
   }
 };
 
+<<<<<<< HEAD
 // 选择套餐，并加载该套餐下的课程包
 const selectCollection = async (coll: CourseCollection) => {
   formData.collectionId = coll.id as number;
+=======
+// 加载指定套餐下的课程包
+const loadPackagesForCollection = async (collectionId: number | string) => {
+  const col = collections.value.find(c => c.id === collectionId);
+  if (!col) return;
+  const packages = await getCourseCollectionPackages(collectionId);
+  (col as any).packages = packages;
+};
+
+// 切换套餐时重新加载课程包并清空已选课程包
+const onCollectionChange = async () => {
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   formData.packageId = undefined;
   formData.courseId = undefined;
   scheduleRefData.value = [];
   lessonTypes.value = [];
+<<<<<<< HEAD
 
   if (!coll.id) return;
   loadingPackages.value = true;
@@ -466,6 +508,16 @@ const selectCollection = async (coll: CourseCollection) => {
     message.error('加载课程包失败');
   } finally {
     loadingPackages.value = false;
+=======
+  const colId = formData.collectionId;
+  if (colId) {
+    loadingPackages.value = true;
+    try {
+      await loadPackagesForCollection(colId);
+    } finally {
+      loadingPackages.value = false;
+    }
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   }
 };
 
diff --git a/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue b/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
index 830788b..8525fb4 100644
--- a/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
+++ b/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
@@ -50,8 +50,22 @@
       <!-- 步骤2: 选择课程包 -->
       <div v-show="currentStep === 1" class="step-panel">
         <h3>选择课程包</h3>
+        <!-- 多套餐时：先选套餐 -->
+        <div v-if="collections.length > 1" class="collection-selector">
+          <div class="selector-label">选择课程套餐</div>
+          <a-radio-group v-model:value="formData.collectionId" button-style="solid" class="collection-radio-group" @change="onCollectionChange">
+            <a-radio-button
+              v-for="col in collections"
+              :key="col.id"
+              :value="col.id as number"
+            >
+              {{ col.name }}
+            </a-radio-button>
+          </a-radio-group>
+        </div>
         <a-spin :spinning="loadingPackages">
         <div v-if="selectedCollection && selectedCollection.packages && selectedCollection.packages.length > 0" class="packages-section">
+          <div v-if="collections.length > 1" class="selector-label" style="margin-bottom: 12px">选择课程包</div>
           <div class="packages-grid">
             <div
               v-for="pkg in selectedCollection.packages"
@@ -383,14 +397,28 @@ const resetForm = () => {
   lessonTypes.value = [];
 };
 
+<<<<<<< HEAD
 // 加载课程套餐列表（租户可拥有多个套餐）
+=======
+// 加载课程套餐列表；多套餐时展示选择器，单套餐时自动选中并加载课程包
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
 const loadCollections = async () => {
   loadingPackages.value = true;
   try {
     collections.value = await getCourseCollections();
+<<<<<<< HEAD
     // 若仅有一个套餐，自动选中并加载其课程包，提升体验
     if (collections.value.length === 1) {
       await selectCollection(collections.value[0]);
+=======
+    if (collections.value.length > 0) {
+      const first = collections.value[0];
+      formData.collectionId = first.id as number;
+      await loadPackagesForCollection(first.id);
+      if (!first.packages || first.packages.length === 0) {
+        message.warning(collections.value.length > 1 ? '该套餐暂无课程包' : '暂无课程包');
+      }
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
     }
   } catch (error) {
     console.error('加载课程套餐失败:', error);
@@ -400,13 +428,27 @@ const loadCollections = async () => {
   }
 };
 
+<<<<<<< HEAD
 // 选择套餐，并加载该套餐下的课程包
 const selectCollection = async (coll: CourseCollection) => {
   formData.collectionId = coll.id as number;
+=======
+// 加载指定套餐下的课程包
+const loadPackagesForCollection = async (collectionId: number | string) => {
+  const col = collections.value.find(c => c.id === collectionId);
+  if (!col) return;
+  const packages = await getCourseCollectionPackages(collectionId);
+  (col as any).packages = packages;
+};
+
+// 切换套餐时重新加载课程包并清空已选课程包
+const onCollectionChange = async () => {
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   formData.packageId = undefined;
   formData.courseId = undefined;
   scheduleRefData.value = [];
   lessonTypes.value = [];
+<<<<<<< HEAD
 
   if (!coll.id) return;
   loadingPackages.value = true;
@@ -421,6 +463,16 @@ const selectCollection = async (coll: CourseCollection) => {
     message.error('加载课程包失败');
   } finally {
     loadingPackages.value = false;
+=======
+  const colId = formData.collectionId;
+  if (colId) {
+    loadingPackages.value = true;
+    try {
+      await loadPackagesForCollection(colId);
+    } finally {
+      loadingPackages.value = false;
+    }
+>>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   }
 };
 
@@ -642,6 +694,26 @@ defineExpose({ open, openWithPreset });
   }
 }
 
+.collection-selector {
+  margin-bottom: 20px;
+  padding: 16px;
+  background: #FAFAFA;
+  border-radius: 8px;
+
+  .selector-label {
+    font-size: 14px;
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 12px;
+  }
+
+  .collection-radio-group {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+}
+
 .collection-option {
   .collection-name { font-weight: 500; }
   .collection-info { font-size: 12px; color: #999; }

From 275b0da7a0bd9f3f35c59597fd666d0a208b8e46 Mon Sep 17 00:00:00 2001
From: zhonghua <zhonghua>
Date: Mon, 23 Mar 2026 14:18:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style:=20=E6=88=91=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E8=A1=A8=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=89=B2=E7=BB=9F=E4=B8=80=E4=B8=BA=E6=A9=99=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Made-with: Cursor
---
 .../views/teacher/schedule/ScheduleView.vue    |  6 +++---
 .../components/TeacherCreateScheduleModal.vue  | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/reading-platform-frontend/src/views/teacher/schedule/ScheduleView.vue b/reading-platform-frontend/src/views/teacher/schedule/ScheduleView.vue
index 5c0ec7a..45a0a63 100644
--- a/reading-platform-frontend/src/views/teacher/schedule/ScheduleView.vue
+++ b/reading-platform-frontend/src/views/teacher/schedule/ScheduleView.vue
@@ -94,7 +94,7 @@
                 </a-tag>
                 <div class="schedule-source">
                   <a-tag v-if="schedule.source === 'SCHOOL'" color="orange" size="small">学校排课</a-tag>
-                  <a-tag v-else color="purple" size="small">自主预约</a-tag>
+                  <a-tag v-else color="orange" size="small">自主预约</a-tag>
                 </div>
                 <div v-if="schedule.hasLesson" class="lesson-status">
                   <a-tag :color="getLessonStatusColor(schedule.lessonStatus)" size="small">
@@ -136,7 +136,7 @@
           </a-descriptions-item>
           <a-descriptions-item label="来源">
             <a-tag v-if="selectedSchedule.source === 'SCHOOL'" color="orange">学校排课</a-tag>
-            <a-tag v-else color="purple">自主预约</a-tag>
+            <a-tag v-else color="orange">自主预约</a-tag>
           </a-descriptions-item>
           <a-descriptions-item label="状态">
             <a-tag :color="getLessonStatusColor(selectedSchedule.status)">
@@ -480,7 +480,7 @@ onMounted(() => {
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
     cursor: pointer;
     transition: all 0.3s;
-    border-left: 3px solid #722ed1;
+    border-left: 3px solid #FF8C42;
 
     &:hover {
       box-shadow: 0 3px 8px rgba(0, 0, 0, 0.15);
diff --git a/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue b/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
index 8525fb4..bd6cfe5 100644
--- a/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
+++ b/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
@@ -723,7 +723,7 @@ defineExpose({ open, openWithPreset });
 
 .collections-grid {
   .collection-card {
-    .package-count { color: #722ed1; }
+    .package-count { color: #FF8C42; }
   }
 }
 
@@ -743,19 +743,19 @@ defineExpose({ open, openWithPreset });
 
   &:hover { border-color: #BDBDBD; }
   &.active {
-    border-color: #722ed1;
-    background: #f9f0ff;
+    border-color: #FF8C42;
+    background: #FFF0E6;
   }
 
   .package-name { font-weight: 500; color: #2D3436; margin-bottom: 4px; }
   .package-grade { font-size: 12px; color: #999; margin-bottom: 2px; }
-  .package-count { font-size: 11px; color: #722ed1; }
+  .package-count { font-size: 11px; color: #FF8C42; }
 }
 
 .schedule-ref-card {
   margin-top: 24px;
   padding: 16px;
-  background: #f9f0ff;
+  background: #FFF8F0;
   border-radius: 8px;
 
   .ref-header {
@@ -765,7 +765,7 @@ defineExpose({ open, openWithPreset });
     margin-bottom: 12px;
 
     .ref-icon {
-      color: #722ed1;
+      color: #FF8C42;
     }
 
     .ref-title {
@@ -829,8 +829,8 @@ defineExpose({ open, openWithPreset });
 
   &:hover { border-color: #BDBDBD; }
   &.active {
-    border-color: #722ed1;
-    background: #f9f0ff;
+    border-color: #FF8C42;
+    background: #FFF0E6;
   }
 
   .class-name { font-weight: 500; color: #2D3436; margin-bottom: 4px; }
@@ -851,7 +851,7 @@ defineExpose({ open, openWithPreset });
 
   div { margin-bottom: 4px; }
   div:last-child { margin-bottom: 0; }
-  strong { color: #722ed1; }
+  strong { color: #FF8C42; }
 }
 
 .modal-footer {

From da415703cf12f0aded3e48d3b9a40f8702c578e8 Mon Sep 17 00:00:00 2001
From: zhonghua <zhonghua>
Date: Mon, 23 Mar 2026 14:31:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=8E=92=E8=AF=BE=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E5=A5=97=E9=A4=90=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=AD=A5=E9=AA=A4=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=E7=AB=AF=E4=B8=8E=E5=AD=A6=E6=A0=A1=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 合并步骤1与步骤2，直接在选择课程包中展示套餐选择器
- 教师端、学校端均由5步改为4步流程
- 修复ID类型比较问题，使用宽松相等避免选中高亮异常

Made-with: Cursor
---
 .../components/CreateScheduleModal.vue        | 232 ++++++------------
 .../components/TeacherCreateScheduleModal.vue | 127 ++++------
 2 files changed, 112 insertions(+), 247 deletions(-)

diff --git a/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue b/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue
index abe5638..be49265 100644
--- a/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue
+++ b/reading-platform-frontend/src/views/school/schedule/components/CreateScheduleModal.vue
@@ -1,15 +1,7 @@
 <template>
-  <a-modal
-    v-model:open="visible"
-    title="新建排课"
-    :confirm-loading="loading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-    width="700px"
-    destroy-on-close
-  >
+  <a-modal v-model:open="visible" title="新建排课" :confirm-loading="loading" @ok="handleSubmit" @cancel="handleCancel"
+    width="700px" destroy-on-close>
     <a-steps :current="currentStep" size="small" class="steps-navigator">
-      <a-step title="选择套餐" />
       <a-step title="选择课程包" />
       <a-step title="选择课程类型" />
       <a-step title="选择班级" />
@@ -17,74 +9,41 @@
     </a-steps>
 
     <div class="step-content">
-      <!-- 步骤1: 选择套餐（租户可拥有多个套餐，一对多） -->
+      <!-- 步骤1: 选择课程包（多套餐时顶部展示套餐选择器） -->
       <div v-show="currentStep === 0" class="step-panel">
-        <h3>选择套餐</h3>
-        <a-alert
-          message="请先选择要排课的套餐，再选择套餐下的课程包"
-          type="info"
-          show-icon
-          style="margin-bottom: 16px"
-        />
-        <a-spin :spinning="loadingPackages">
-          <div v-if="collections.length > 0" class="packages-section">
-            <div class="packages-grid collections-grid">
-              <div
-                v-for="coll in collections"
-                :key="coll.id"
-                :class="['package-card collection-card', { active: formData.collectionId === coll.id }]"
-                @click="selectCollection(coll)"
-              >
-                <div class="package-name">{{ coll.name }}</div>
-                <div class="package-grade">{{ Array.isArray(coll.gradeLevels) ? coll.gradeLevels.join(', ') : (coll.gradeLevels || '-') }}</div>
-                <div class="package-count">{{ coll.packageCount ?? 0 }} 个课程包</div>
-              </div>
-            </div>
-          </div>
-          <div v-else-if="!loadingPackages" class="packages-section">
-            <a-alert message="暂无课程套餐，请联系管理员" type="info" show-icon />
-          </div>
-        </a-spin>
-      </div>
-
-      <!-- 步骤2: 选择课程包 -->
-      <div v-show="currentStep === 1" class="step-panel">
         <h3>选择课程包</h3>
         <!-- 多套餐时：先选套餐 -->
         <div v-if="collections.length > 1" class="collection-selector">
           <div class="selector-label">选择课程套餐</div>
-          <a-radio-group v-model:value="formData.collectionId" button-style="solid" class="collection-radio-group" @change="onCollectionChange">
-            <a-radio-button
-              v-for="col in collections"
-              :key="col.id"
-              :value="col.id as number"
-            >
+          <a-radio-group v-model:value="formData.collectionId" button-style="solid" class="collection-radio-group"
+            @change="onCollectionChange">
+            <a-radio-button v-for="col in collections" :key="col.id" :value="col.id as number">
               {{ col.name }}
             </a-radio-button>
           </a-radio-group>
         </div>
         <a-spin :spinning="loadingPackages">
-        <div v-if="selectedCollection && selectedCollection.packages && selectedCollection.packages.length > 0" class="packages-section">
-          <div v-if="collections.length > 1" class="selector-label" style="margin-bottom: 12px">选择课程包</div>
-          <div class="packages-grid">
-            <div
-              v-for="pkg in selectedCollection.packages"
-              :key="pkg.id"
-              :class="['package-card', { active: formData.packageId === pkg.id }]"
-              @click="selectPackage(pkg.id)"
-            >
-              <div class="package-name">{{ pkg.name }}</div>
-              <div class="package-grade">{{ Array.isArray(pkg.gradeLevels) ? pkg.gradeLevels.join(', ') : pkg.gradeLevels }}</div>
-              <div class="package-count">{{ pkg.courseCount }} 门课程</div>
+          <div v-if="selectedCollection && selectedCollection.packages && selectedCollection.packages.length > 0"
+            class="packages-section">
+            <div v-if="collections.length > 1" class="selector-label" style="margin-bottom: 12px">选择课程包</div>
+            <div class="packages-grid">
+              <div v-for="pkg in selectedCollection.packages" :key="pkg.id"
+                :class="['package-card', { active: formData.packageId == pkg.id }]" @click="selectPackage(Number(pkg.id) || pkg.id)">
+                <div class="package-name">{{ pkg.name }}</div>
+                <div class="package-grade">{{ Array.isArray(pkg.gradeLevels) ? pkg.gradeLevels.join(', ') :
+                  pkg.gradeLevels }}</div>
+                <div class="package-count">{{ pkg.courseCount }} 门课程</div>
+              </div>
             </div>
           </div>
-        </div>
-        <div v-else-if="!loadingPackages && selectedCollection && (!selectedCollection.packages || selectedCollection.packages.length === 0)" class="packages-section">
-          <a-alert message="该套餐暂无课程包" type="warning" show-icon />
-        </div>
-        <div v-else-if="!loadingPackages && !selectedCollection" class="packages-section">
-          <a-alert message="请先选择套餐" type="info" show-icon />
-        </div>
+          <div
+            v-else-if="!loadingPackages && selectedCollection && (!selectedCollection.packages || selectedCollection.packages.length === 0)"
+            class="packages-section">
+            <a-alert message="该套餐暂无课程包" type="warning" show-icon />
+          </div>
+          <div v-else-if="!loadingPackages && !selectedCollection" class="packages-section">
+            <a-alert message="请先选择套餐" type="info" show-icon />
+          </div>
         </a-spin>
 
         <!-- 排课计划参考（与管理端课程包详情一致） -->
@@ -93,13 +52,8 @@
             <CalendarOutlined class="ref-icon" />
             <span class="ref-title">排课计划参考</span>
           </div>
-          <a-table
-            :columns="scheduleRefColumns"
-            :data-source="scheduleRefDisplay"
-            :pagination="false"
-            size="small"
-            bordered
-          >
+          <a-table :columns="scheduleRefColumns" :data-source="scheduleRefDisplay" :pagination="false" size="small"
+            bordered>
             <template #bodyCell="{ column, record }">
               <template v-if="column.key === 'dayOfWeek'">
                 {{ formatDayOfWeek(record.dayOfWeek) }}
@@ -115,27 +69,18 @@
         </div>
       </div>
 
-      <!-- 步骤3: 选择课程类型 -->
-      <div v-show="currentStep === 2" class="step-panel">
+      <!-- 步骤2: 选择课程类型 -->
+      <div v-show="currentStep === 1" class="step-panel">
         <h3>选择课程类型</h3>
-        <a-alert
-          message="请选择一个课程类型进行排课"
-          type="info"
-          show-icon
-          style="margin-bottom: 16px"
-        />
+        <a-alert message="请选择一个课程类型进行排课" type="info" show-icon style="margin-bottom: 16px" />
         <a-spin :spinning="loadingLessonTypes">
           <div v-if="!loadingLessonTypes && lessonTypes.length === 0" class="lesson-type-empty">
             该课程包暂无课程类型，请先选择其他课程包
           </div>
           <div v-else class="lesson-type-grid">
-            <div
-              v-for="type in lessonTypes"
-              :key="type.lessonType"
+            <div v-for="type in lessonTypes" :key="type.lessonType"
               :class="['lesson-type-card', { active: formData.lessonType === type.lessonType }]"
-              :style="getLessonTagStyle(type.lessonType)"
-              @click="selectLessonType(type.lessonType)"
-            >
+              :style="getLessonTagStyle(type.lessonType)" @click="selectLessonType(type.lessonType)">
               <div class="type-icon">
                 <component :is="getLessonTypeIconComponent(type.lessonType)" />
               </div>
@@ -146,15 +91,10 @@
         </a-spin>
       </div>
 
-      <!-- 步骤4: 选择班级并分配教师 -->
-      <div v-show="currentStep === 3" class="step-panel">
+      <!-- 步骤3: 选择班级并分配教师 -->
+      <div v-show="currentStep === 2" class="step-panel">
         <h3>选择班级并分配教师</h3>
-        <a-alert
-          message="选择班级后，为每个班级指定授课教师"
-          type="info"
-          show-icon
-          style="margin-bottom: 16px"
-        />
+        <a-alert message="选择班级后，为每个班级指定授课教师" type="info" show-icon style="margin-bottom: 16px" />
         <div class="grade-selector">
           <a-radio-group v-model:value="selectedGrade" button-style="solid">
             <a-radio-button value="">全部</a-radio-button>
@@ -164,11 +104,8 @@
           </a-radio-group>
         </div>
         <div class="class-teacher-grid">
-          <div
-            v-for="cls in filteredClasses"
-            :key="cls.id"
-            :class="['class-teacher-card', { selected: isClassSelected(cls.id) }]"
-          >
+          <div v-for="cls in filteredClasses" :key="cls.id"
+            :class="['class-teacher-card', { selected: isClassSelected(cls.id) }]">
             <div class="class-header" @click="toggleClass(cls.id)">
               <a-checkbox :checked="isClassSelected(cls.id)" @click.stop />
               <div class="class-info">
@@ -177,13 +114,8 @@
               </div>
             </div>
             <div v-if="isClassSelected(cls.id)" class="teacher-selector">
-              <a-select
-                v-model:value="classTeacherMap[cls.id]"
-                placeholder="选择教师"
-                style="width: 100%"
-                show-search
-                :filter-option="filterTeacher"
-              >
+              <a-select v-model:value="classTeacherMap[cls.id]" placeholder="选择教师" style="width: 100%" show-search
+                :filter-option="filterTeacher">
                 <a-select-option v-for="teacher in teachers" :key="teacher.id" :value="teacher.id">
                   {{ teacher.name }}
                 </a-select-option>
@@ -196,26 +128,18 @@
         </div>
       </div>
 
-      <!-- 步骤5: 设置时间 -->
-      <div v-show="currentStep === 4" class="step-panel">
+      <!-- 步骤4: 设置时间 -->
+      <div v-show="currentStep === 3" class="step-panel">
         <h3>设置时间</h3>
         <a-form layout="vertical">
           <a-form-item label="排课日期" required>
-            <a-date-picker
-              v-model:value="formData.scheduledDate"
-              style="width: 100%"
-              placeholder="选择日期"
-              :disabled-date="(current) => current && current < dayjs().startOf('day')"
-            />
+            <a-date-picker v-model:value="formData.scheduledDate" style="width: 100%" placeholder="选择日期"
+              :disabled-date="(current) => current && current < dayjs().startOf('day')" />
           </a-form-item>
 
           <a-form-item label="时间段" required>
-            <a-time-range-picker
-              v-model:value="formData.scheduledTimeRange"
-              format="HH:mm"
-              style="width: 100%"
-              :placeholder="['开始时间', '结束时间']"
-            />
+            <a-time-range-picker v-model:value="formData.scheduledTimeRange" format="HH:mm" style="width: 100%"
+              :placeholder="['开始时间', '结束时间']" />
           </a-form-item>
         </a-form>
 
@@ -257,7 +181,7 @@
     <template #footer>
       <div class="modal-footer">
         <a-button v-if="currentStep > 0" @click="prevStep">上一步</a-button>
-        <a-button v-if="currentStep < 4" type="primary" @click="nextStep">下一步</a-button>
+        <a-button v-if="currentStep < 3" type="primary" @click="nextStep">下一步</a-button>
         <a-button v-else type="primary" :loading="loading" @click="handleSubmit">创建排课</a-button>
         <a-button @click="handleCancel">取消</a-button>
       </div>
@@ -442,28 +366,19 @@ const resetForm = () => {
   classTeacherMap.value = {};
 };
 
-<<<<<<< HEAD
 // 加载课程套餐列表（租户可拥有多个套餐）
-=======
-// 加载课程套餐列表；多套餐时展示选择器，单套餐时自动选中并加载课程包
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
 const loadCollections = async () => {
   loadingPackages.value = true;
   try {
     collections.value = await getCourseCollections();
-<<<<<<< HEAD
-    // 若仅有一个套餐，自动选中并加载其课程包，提升体验
-    if (collections.value.length === 1) {
-      await selectCollection(collections.value[0]);
-=======
     if (collections.value.length > 0) {
       const first = collections.value[0];
       formData.collectionId = first.id as number;
-      await loadPackagesForCollection(first.id);
-      if (!first.packages || first.packages.length === 0) {
-        message.warning(collections.value.length > 1 ? '该套餐暂无课程包' : '暂无课程包');
+      if (collections.value.length === 1) {
+        await selectCollection(first);
+      } else {
+        await loadPackagesForCollection(first.id);
       }
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
     }
   } catch (error) {
     console.error('❌ 加载课程套餐失败:', error);
@@ -473,27 +388,13 @@ const loadCollections = async () => {
   }
 };
 
-<<<<<<< HEAD
 // 选择套餐，并加载该套餐下的课程包
 const selectCollection = async (coll: CourseCollection) => {
   formData.collectionId = coll.id as number;
-=======
-// 加载指定套餐下的课程包
-const loadPackagesForCollection = async (collectionId: number | string) => {
-  const col = collections.value.find(c => c.id === collectionId);
-  if (!col) return;
-  const packages = await getCourseCollectionPackages(collectionId);
-  (col as any).packages = packages;
-};
-
-// 切换套餐时重新加载课程包并清空已选课程包
-const onCollectionChange = async () => {
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   formData.packageId = undefined;
   formData.courseId = undefined;
   scheduleRefData.value = [];
   lessonTypes.value = [];
-<<<<<<< HEAD
 
   if (!coll.id) return;
   loadingPackages.value = true;
@@ -508,7 +409,23 @@ const onCollectionChange = async () => {
     message.error('加载课程包失败');
   } finally {
     loadingPackages.value = false;
-=======
+  }
+};
+
+// 加载指定套餐下的课程包
+const loadPackagesForCollection = async (collectionId: number | string) => {
+  const col = collections.value.find(c => c.id === collectionId);
+  if (!col) return;
+  const packages = await getCourseCollectionPackages(collectionId);
+  (col as any).packages = packages;
+};
+
+// 切换套餐时重新加载课程包并清空已选课程包
+const onCollectionChange = async () => {
+  formData.packageId = undefined;
+  formData.courseId = undefined;
+  scheduleRefData.value = [];
+  lessonTypes.value = [];
   const colId = formData.collectionId;
   if (colId) {
     loadingPackages.value = true;
@@ -517,7 +434,6 @@ const onCollectionChange = async () => {
     } finally {
       loadingPackages.value = false;
     }
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   }
 };
 
@@ -546,7 +462,7 @@ const selectPackage = async (packageId: number) => {
 
   // 自动选择第一门课程（用于后端API）
   if (selectedCollection.value?.packages) {
-    const selectedPkg = selectedCollection.value.packages.find((p: any) => p.id === packageId);
+    const selectedPkg = selectedCollection.value.packages.find((p: any) => p.id == packageId || Number(p.id) === packageId);
     if (selectedPkg?.courses && selectedPkg.courses.length > 0) {
       // 自动设置为第一门课程
       formData.courseId = selectedPkg.courses[0].id;
@@ -667,12 +583,6 @@ const getSelectedClassesWithTeachers = () => {
 const validateStep = (): boolean => {
   switch (currentStep.value) {
     case 0:
-      if (!formData.collectionId) {
-        message.warning('请选择套餐');
-        return false;
-      }
-      break;
-    case 1:
       if (!formData.collectionId) {
         message.warning('请选择套餐');
         return false;
@@ -686,13 +596,13 @@ const validateStep = (): boolean => {
         return false;
       }
       break;
-    case 2:
+    case 1:
       if (!formData.lessonType) {
         message.warning('请选择课程类型');
         return false;
       }
       break;
-    case 3:
+    case 2:
       if (formData.classIds.length === 0) {
         message.warning('请至少选择一个班级');
         return false;
@@ -706,7 +616,7 @@ const validateStep = (): boolean => {
         }
       }
       break;
-    case 4:
+    case 3:
       if (!formData.scheduledDate) {
         message.warning('请选择排课日期');
         return false;
diff --git a/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue b/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
index bd6cfe5..3bd2006 100644
--- a/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
+++ b/reading-platform-frontend/src/views/teacher/schedule/components/TeacherCreateScheduleModal.vue
@@ -9,7 +9,6 @@
     destroy-on-close
   >
     <a-steps :current="currentStep" size="small" class="steps-navigator">
-      <a-step title="选择套餐" />
       <a-step title="选择课程包" />
       <a-step title="选择课程类型" />
       <a-step title="选择班级" />
@@ -17,38 +16,8 @@
     </a-steps>
 
     <div class="step-content">
-      <!-- 步骤1: 选择套餐（租户可拥有多个套餐，一对多） -->
+      <!-- 步骤1: 选择课程包（多套餐时顶部展示套餐选择器） -->
       <div v-show="currentStep === 0" class="step-panel">
-        <h3>选择套餐</h3>
-        <a-alert
-          message="请先选择要预约的套餐，再选择套餐下的课程包"
-          type="info"
-          show-icon
-          style="margin-bottom: 16px"
-        />
-        <a-spin :spinning="loadingPackages">
-          <div v-if="collections.length > 0" class="packages-section">
-            <div class="packages-grid collections-grid">
-              <div
-                v-for="coll in collections"
-                :key="coll.id"
-                :class="['package-card collection-card', { active: formData.collectionId === coll.id }]"
-                @click="selectCollection(coll)"
-              >
-                <div class="package-name">{{ coll.name }}</div>
-                <div class="package-grade">{{ Array.isArray(coll.gradeLevels) ? coll.gradeLevels.join(', ') : (coll.gradeLevels || '-') }}</div>
-                <div class="package-count">{{ coll.packageCount ?? 0 }} 个课程包</div>
-              </div>
-            </div>
-          </div>
-          <div v-else-if="!loadingPackages" class="packages-section">
-            <a-alert message="暂无课程套餐，请联系管理员" type="info" show-icon />
-          </div>
-        </a-spin>
-      </div>
-
-      <!-- 步骤2: 选择课程包 -->
-      <div v-show="currentStep === 1" class="step-panel">
         <h3>选择课程包</h3>
         <!-- 多套餐时：先选套餐 -->
         <div v-if="collections.length > 1" class="collection-selector">
@@ -70,8 +39,8 @@
             <div
               v-for="pkg in selectedCollection.packages"
               :key="pkg.id"
-              :class="['package-card', { active: formData.packageId === pkg.id }]"
-              @click="selectPackage(pkg.id)"
+              :class="['package-card', { active: formData.packageId == pkg.id }]"
+              @click="selectPackage(Number(pkg.id))"
             >
               <div class="package-name">{{ pkg.name }}</div>
               <div class="package-grade">{{ Array.isArray(pkg.gradeLevels) ? pkg.gradeLevels.join(', ') : pkg.gradeLevels }}</div>
@@ -115,8 +84,8 @@
         </div>
       </div>
 
-      <!-- 步骤3: 选择课程类型 -->
-      <div v-show="currentStep === 2" class="step-panel">
+      <!-- 步骤2: 选择课程类型 -->
+      <div v-show="currentStep === 1" class="step-panel">
         <h3>选择课程类型</h3>
         <a-alert
           message="请选择一个课程类型进行排课"
@@ -146,8 +115,8 @@
         </a-spin>
       </div>
 
-      <!-- 步骤4: 选择班级（教师端单选） -->
-      <div v-show="currentStep === 3" class="step-panel">
+      <!-- 步骤3: 选择班级（教师端单选） -->
+      <div v-show="currentStep === 2" class="step-panel">
         <h3>选择班级</h3>
         <a-alert
           message="请选择要排课的班级"
@@ -169,8 +138,8 @@
         <div v-if="myClasses.length === 0" class="empty-hint">暂无可用班级</div>
       </div>
 
-      <!-- 步骤5: 设置时间 -->
-      <div v-show="currentStep === 4" class="step-panel">
+      <!-- 步骤4: 设置时间 -->
+      <div v-show="currentStep === 3" class="step-panel">
         <h3>设置时间</h3>
         <a-form layout="vertical">
           <a-form-item label="排课日期" required>
@@ -210,7 +179,7 @@
     <template #footer>
       <div class="modal-footer">
         <a-button v-if="currentStep > 0" @click="prevStep">上一步</a-button>
-        <a-button v-if="currentStep < 4" type="primary" @click="nextStep">下一步</a-button>
+        <a-button v-if="currentStep < 3" type="primary" @click="nextStep">下一步</a-button>
         <a-button v-else type="primary" :loading="loading" @click="handleSubmit">创建排课</a-button>
         <a-button @click="handleCancel">取消</a-button>
       </div>
@@ -237,7 +206,6 @@ import {
   getCourseCollectionPackages,
   getCoursePackageLessonTypes,
   type CourseCollection,
-  type CoursePackageItem,
   type LessonTypeInfo,
 } from '@/api/school';
 import { getTeacherClasses, createTeacherSchedule, type TeacherClass } from '@/api/teacher';
@@ -377,12 +345,12 @@ const openWithPreset = async (preset: SchedulePreset) => {
   } catch {
     // 校本课程等场景可能无对应课程包接口，使用预设类型填充
     lessonTypes.value = preset.lessonType
-      ? [{ lessonType: preset.lessonType, count: 1 }]
+      ? [{ lessonType: preset.lessonType, lessonTypeName: getLessonTypeName(preset.lessonType), count: 1 }]
       : [];
   }
 
-  // 从选择课程类型（步骤2）开始，跳过套餐与课程包
-  currentStep.value = 2;
+  // 从选择课程类型开始，跳过课程包选择
+  currentStep.value = 1;
 };
 
 const resetForm = () => {
@@ -397,28 +365,20 @@ const resetForm = () => {
   lessonTypes.value = [];
 };
 
-<<<<<<< HEAD
 // 加载课程套餐列表（租户可拥有多个套餐）
-=======
-// 加载课程套餐列表；多套餐时展示选择器，单套餐时自动选中并加载课程包
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
 const loadCollections = async () => {
   loadingPackages.value = true;
   try {
     collections.value = await getCourseCollections();
-<<<<<<< HEAD
-    // 若仅有一个套餐，自动选中并加载其课程包，提升体验
-    if (collections.value.length === 1) {
-      await selectCollection(collections.value[0]);
-=======
     if (collections.value.length > 0) {
       const first = collections.value[0];
       formData.collectionId = first.id as number;
-      await loadPackagesForCollection(first.id);
-      if (!first.packages || first.packages.length === 0) {
-        message.warning(collections.value.length > 1 ? '该套餐暂无课程包' : '暂无课程包');
+      // 若仅有一个套餐，自动加载其课程包
+      if (collections.value.length === 1) {
+        await selectCollection(first);
+      } else {
+        await loadPackagesForCollection(first.id);
       }
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
     }
   } catch (error) {
     console.error('加载课程套餐失败:', error);
@@ -428,27 +388,13 @@ const loadCollections = async () => {
   }
 };
 
-<<<<<<< HEAD
 // 选择套餐，并加载该套餐下的课程包
 const selectCollection = async (coll: CourseCollection) => {
   formData.collectionId = coll.id as number;
-=======
-// 加载指定套餐下的课程包
-const loadPackagesForCollection = async (collectionId: number | string) => {
-  const col = collections.value.find(c => c.id === collectionId);
-  if (!col) return;
-  const packages = await getCourseCollectionPackages(collectionId);
-  (col as any).packages = packages;
-};
-
-// 切换套餐时重新加载课程包并清空已选课程包
-const onCollectionChange = async () => {
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   formData.packageId = undefined;
   formData.courseId = undefined;
   scheduleRefData.value = [];
   lessonTypes.value = [];
-<<<<<<< HEAD
 
   if (!coll.id) return;
   loadingPackages.value = true;
@@ -463,7 +409,23 @@ const onCollectionChange = async () => {
     message.error('加载课程包失败');
   } finally {
     loadingPackages.value = false;
-=======
+  }
+};
+
+// 加载指定套餐下的课程包
+const loadPackagesForCollection = async (collectionId: number | string) => {
+  const col = collections.value.find(c => c.id === collectionId);
+  if (!col) return;
+  const packages = await getCourseCollectionPackages(collectionId);
+  (col as any).packages = packages;
+};
+
+// 切换套餐时重新加载课程包并清空已选课程包（步骤2 多套餐时的选择器）
+const onCollectionChange = async () => {
+  formData.packageId = undefined;
+  formData.courseId = undefined;
+  scheduleRefData.value = [];
+  lessonTypes.value = [];
   const colId = formData.collectionId;
   if (colId) {
     loadingPackages.value = true;
@@ -472,7 +434,6 @@ const onCollectionChange = async () => {
     } finally {
       loadingPackages.value = false;
     }
->>>>>>> d300fa4 (feat: 校园端排课、教师端预约排课添加套餐选择)
   }
 };
 
@@ -489,7 +450,7 @@ const selectPackage = async (packageId: number) => {
 
   const collection = selectedCollection.value;
   if (collection?.packages) {
-    const pkg = collection.packages.find((p: any) => p.id === packageId);
+    const pkg = collection.packages.find((p: any) => p.id == packageId || Number(p.id) === packageId);
     if (pkg?.courses && pkg.courses.length > 0) {
       formData.courseId = pkg.courses[0].id;
 
@@ -565,12 +526,6 @@ const getSelectedTimeRange = (): string => {
 const validateStep = (): boolean => {
   switch (currentStep.value) {
     case 0:
-      if (!formData.collectionId) {
-        message.warning('请选择套餐');
-        return false;
-      }
-      break;
-    case 1:
       if (!formData.collectionId) {
         message.warning('请选择套餐');
         return false;
@@ -584,19 +539,19 @@ const validateStep = (): boolean => {
         return false;
       }
       break;
-    case 2:
+    case 1:
       if (!formData.lessonType) {
         message.warning('请选择课程类型');
         return false;
       }
       break;
-    case 3:
+    case 2:
       if (!formData.classId) {
         message.warning('请选择班级');
         return false;
       }
       break;
-    case 4:
+    case 3:
       if (!formData.scheduledDate) {
         message.warning('请选择排课日期');
         return false;
@@ -615,8 +570,8 @@ const nextStep = () => {
 };
 
 const prevStep = () => {
-  // 预设模式下从步骤2点击上一步时关闭弹窗（不展示套餐/课程包选择）
-  if (isPresetMode.value && currentStep.value === 2) {
+  // 预设模式下从选择课程类型点击上一步时关闭弹窗（不展示课程包选择）
+  if (isPresetMode.value && currentStep.value === 1) {
     handleCancel();
     return;
   }

From 029881f09fec52b39907dc441906ae3fa02b902e Mon Sep 17 00:00:00 2001
From: zhonghua <zhonghua>
Date: Mon, 23 Mar 2026 14:47:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E6=88=90=E9=95=BF=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=20images=20=E5=BA=8F=E5=88=97=E5=8C=96=E7=BB=9F=E4=B8=80=20+?=
 =?UTF-8?q?=20=E7=A7=9F=E6=88=B7=E5=A5=97=E9=A4=90=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 成长记录: images 统一为 string[]，修复 OpenAPI/Java DTO/前端类型
- 租户更新: TenantUpdateRequest 新增 forceRemove，ErrorCode 新增 REMOVE_PACKAGE_HAS_SCHEDULES
- 异常处理: BusinessException 支持附加 data，GlobalExceptionHandler 返回 data 供前端确认弹窗

Made-with: Cursor
---
 reading-platform-frontend/openapi.json         | 10 ++++++----
 .../scripts/fetch-openapi.js                   | 18 ++++++++++++++++++
 .../model/growthRecordCreateRequest.ts         |  4 ++--
 .../model/growthRecordUpdateRequest.ts         |  4 ++--
 .../platform/common/enums/ErrorCode.java       |  1 +
 .../common/exception/BusinessException.java    | 12 ++++++++++++
 .../exception/GlobalExceptionHandler.java      |  4 ++--
 .../platform/common/response/Result.java       | 11 +++++++++++
 .../dto/request/GrowthRecordCreateRequest.java |  4 ++--
 .../dto/request/GrowthRecordUpdateRequest.java |  4 ++--
 .../dto/request/TenantUpdateRequest.java       |  3 +++
 11 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/reading-platform-frontend/openapi.json b/reading-platform-frontend/openapi.json
index c622793..3b211bc 100644
--- a/reading-platform-frontend/openapi.json
+++ b/reading-platform-frontend/openapi.json
@@ -26910,8 +26910,9 @@
             "description": "内容"
           },
           "images": {
-            "type": "string",
-            "description": "图片（JSON 数组）"
+            "type": "array",
+            "items": { "type": "string", "description": "图片 URL" },
+            "description": "图片 URL 列表"
           },
           "recordDate": {
             "type": "string",
@@ -30152,8 +30153,9 @@
             "description": "内容"
           },
           "images": {
-            "type": "string",
-            "description": "图片（JSON 数组）"
+            "type": "array",
+            "items": { "type": "string", "description": "图片 URL" },
+            "description": "图片 URL 列表"
           },
           "recordDate": {
             "type": "string",
diff --git a/reading-platform-frontend/scripts/fetch-openapi.js b/reading-platform-frontend/scripts/fetch-openapi.js
index a3b6926..ff4870f 100644
--- a/reading-platform-frontend/scripts/fetch-openapi.js
+++ b/reading-platform-frontend/scripts/fetch-openapi.js
@@ -31,6 +31,8 @@ async function fetchAndFix() {
   if (spec.components?.schemas) {
     delete spec.components.schemas['ResultObject[]'];
   }
+  // 修复成长记录 images 字段：统一为 array of string（避免 SpringDoc 误生成为 string）
+  fixGrowthRecordImagesSchema(spec.components?.schemas);
 
   writeFileSync(OUTPUT, JSON.stringify(spec, null, 2));
   console.log('OpenAPI spec written to:', OUTPUT);
@@ -61,6 +63,22 @@ function fixSchema(schema) {
   if (schema.items) fixSchema(schema.items);
 }
 
+/** 将 GrowthRecordCreateRequest/GrowthRecordUpdateRequest 的 images 统一为 array of string */
+function fixGrowthRecordImagesSchema(schemas) {
+  if (!schemas) return;
+  const arrayOfString = {
+    type: 'array',
+    items: { type: 'string', description: '图片 URL' },
+    description: '图片 URL 列表',
+  };
+  for (const name of ['GrowthRecordCreateRequest', 'GrowthRecordUpdateRequest']) {
+    const s = schemas[name];
+    if (s?.properties?.images?.type === 'string') {
+      schemas[name].properties.images = arrayOfString;
+    }
+  }
+}
+
 function inlineResultObjectArrayRef(paths) {
   const inlineSchema = {
     type: 'object',
diff --git a/reading-platform-frontend/src/api/generated/model/growthRecordCreateRequest.ts b/reading-platform-frontend/src/api/generated/model/growthRecordCreateRequest.ts
index 08d6821..d338b4f 100644
--- a/reading-platform-frontend/src/api/generated/model/growthRecordCreateRequest.ts
+++ b/reading-platform-frontend/src/api/generated/model/growthRecordCreateRequest.ts
@@ -18,8 +18,8 @@ export interface GrowthRecordCreateRequest {
   title: string;
   /** 内容 */
   content?: string;
-  /** 图片（JSON 数组） */
-  images?: string;
+  /** 图片 URL 列表 */
+  images?: string[];
   /** 记录日期 */
   recordDate?: string;
   /** 标签 */
diff --git a/reading-platform-frontend/src/api/generated/model/growthRecordUpdateRequest.ts b/reading-platform-frontend/src/api/generated/model/growthRecordUpdateRequest.ts
index 55c858e..6937d58 100644
--- a/reading-platform-frontend/src/api/generated/model/growthRecordUpdateRequest.ts
+++ b/reading-platform-frontend/src/api/generated/model/growthRecordUpdateRequest.ts
@@ -16,8 +16,8 @@ export interface GrowthRecordUpdateRequest {
   title?: string;
   /** 内容 */
   content?: string;
-  /** 图片（JSON 数组） */
-  images?: string;
+  /** 图片 URL 列表 */
+  images?: string[];
   /** 记录日期 */
   recordDate?: string;
   /** 标签 */
diff --git a/reading-platform-java/src/main/java/com/reading/platform/common/enums/ErrorCode.java b/reading-platform-java/src/main/java/com/reading/platform/common/enums/ErrorCode.java
index 1a5585e..e7d9ecd 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/common/enums/ErrorCode.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/common/enums/ErrorCode.java
@@ -37,6 +37,7 @@ public enum ErrorCode {
 
     // Package Errors (3100+)
     PACKAGE_NOT_FOUND(3101, "Package not found"),
+    REMOVE_PACKAGE_HAS_SCHEDULES(3102, "该套餐下有排课计划"),
 
     // User Errors (4000+)
     USER_NOT_FOUND(4001, "User not found"),
diff --git a/reading-platform-java/src/main/java/com/reading/platform/common/exception/BusinessException.java b/reading-platform-java/src/main/java/com/reading/platform/common/exception/BusinessException.java
index ece1b07..74f5f4f 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/common/exception/BusinessException.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/common/exception/BusinessException.java
@@ -11,29 +11,41 @@ public class BusinessException extends RuntimeException {
 
     private final Integer code;
     private final String message;
+    private final Object data;
 
     public BusinessException(String message) {
         super(message);
         this.code = 500;
         this.message = message;
+        this.data = null;
     }
 
     public BusinessException(Integer code, String message) {
         super(message);
         this.code = code;
         this.message = message;
+        this.data = null;
     }
 
     public BusinessException(ErrorCode errorCode) {
         super(errorCode.getMessage());
         this.code = errorCode.getCode();
         this.message = errorCode.getMessage();
+        this.data = null;
     }
 
     public BusinessException(ErrorCode errorCode, String message) {
         super(message);
         this.code = errorCode.getCode();
         this.message = message;
+        this.data = null;
+    }
+
+    public BusinessException(ErrorCode errorCode, String message, Object data) {
+        super(message);
+        this.code = errorCode.getCode();
+        this.message = message;
+        this.data = data;
     }
 
     public static BusinessException of(String message) {
diff --git a/reading-platform-java/src/main/java/com/reading/platform/common/exception/GlobalExceptionHandler.java b/reading-platform-java/src/main/java/com/reading/platform/common/exception/GlobalExceptionHandler.java
index cd0508e..930a13e 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/common/exception/GlobalExceptionHandler.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/common/exception/GlobalExceptionHandler.java
@@ -33,9 +33,9 @@ public class GlobalExceptionHandler {
     private String activeProfile;
 
     @ExceptionHandler(BusinessException.class)
-    public Result<Void> handleBusinessException(BusinessException e, HttpServletRequest request) {
+    public Result<Object> handleBusinessException(BusinessException e, HttpServletRequest request) {
         log.warn("业务异常 at {}: {}", request.getRequestURI(), e.getMessage());
-        return Result.error(e.getCode(), e.getMessage());
+        return Result.error(e.getCode(), e.getMessage(), e.getData());
     }
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
diff --git a/reading-platform-java/src/main/java/com/reading/platform/common/response/Result.java b/reading-platform-java/src/main/java/com/reading/platform/common/response/Result.java
index c82c436..ce8926c 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/common/response/Result.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/common/response/Result.java
@@ -84,6 +84,17 @@ public class Result<T> implements Serializable {
         return result;
     }
 
+    /**
+     * 错误响应（带错误码、消息和附加数据）
+     */
+    public static <T> Result<T> error(Integer code, String message, T data) {
+        Result<T> result = new Result<>();
+        result.setCode(code);
+        result.setMessage(message);
+        result.setData(data);
+        return result;
+    }
+
     /**
      * 错误响应（默认 500）
      */
diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordCreateRequest.java b/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordCreateRequest.java
index f7d83bb..f207856 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordCreateRequest.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordCreateRequest.java
@@ -29,13 +29,13 @@ public class GrowthRecordCreateRequest {
     @Schema(description = "内容")
     private String content;
 
-    @Schema(description = "图片 URL 列表")
+    @Schema(description = "图片 URL 列表", type = "array", implementation = String.class)
     private List<String> images;
 
     @Schema(description = "记录日期")
     private LocalDate recordDate;
 
-    @Schema(description = "标签")
+    @Schema(description = "标签", type = "array", implementation = String.class)
     private List<String> tags;
 
 }
diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordUpdateRequest.java b/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordUpdateRequest.java
index 8a54127..dda3b71 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordUpdateRequest.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/dto/request/GrowthRecordUpdateRequest.java
@@ -19,13 +19,13 @@ public class GrowthRecordUpdateRequest {
     @Schema(description = "内容")
     private String content;
 
-    @Schema(description = "图片 URL 列表")
+    @Schema(description = "图片 URL 列表", type = "array", implementation = String.class)
     private List<String> images;
 
     @Schema(description = "记录日期")
     private LocalDate recordDate;
 
-    @Schema(description = "标签")
+    @Schema(description = "标签", type = "array", implementation = String.class)
     private List<String> tags;
 
 }
diff --git a/reading-platform-java/src/main/java/com/reading/platform/dto/request/TenantUpdateRequest.java b/reading-platform-java/src/main/java/com/reading/platform/dto/request/TenantUpdateRequest.java
index 49064b4..b2a79a8 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/dto/request/TenantUpdateRequest.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/dto/request/TenantUpdateRequest.java
@@ -36,6 +36,9 @@ public class TenantUpdateRequest {
     @Schema(description = "课程套餐ID（用于三层架构）")
     private List<Long> collectionIds;
 
+    @Schema(description = "是否强制移除套餐（即便套餐下有排课计划）")
+    private Boolean forceRemove;
+
     @Schema(description = "教师配额")
     private Integer teacherQuota;