Merge remote-tracking branch 'origin/main' into main

backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/TrainingProgramController.java

@@ -1,5 +1,6 @@
 package com.roomroot.web.controller.jwgl;
 
+import com.roomroot.jwgl.entity.JXGLJG;
 import com.roomroot.jwgl.entity.ZYB;
 import com.roomroot.jwgl.service.TrainingProgramService;
 import com.roomroot.jwgl.unit.PageQuery;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.annotation.Resource;
+import java.util.List;
 
 /**
  * 培养方案管理控制器
@@ -137,4 +139,12 @@ public class TrainingProgramController {
     public void exportData(HttpServletResponse response) throws Exception {
         trainingProgramService.exportZYBExcel(response);
     }
+
+    /**
+     * 教学管理机构下拉选项（来自教学管理机构表，提交编号、展示名称）。
+     */
+    @GetMapping("/teaching-organizations")
+    public Result<List<JXGLJG>> listTeachingOrganizations() {
+        return Result.success(trainingProgramService.listTeachingOrganizations());
+    }
 }