更新

src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -29,11 +29,7 @@ import java.util.List;
  * @since 2025-06-13
  */
 @RestController
-<<<<<<< HEAD
 public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI {
-=======
-public class WelcomeDormitoryController {
->>>>>>> fc9ba255cfc10a702863cc05b02a4b0f4b58cf94
 
     @Autowired
     WelcomeDormitoryService welcomeDormitoryService;

src/main/java/com/template/controller/WelcomeOrgController.java

@@ -44,7 +44,7 @@ public class WelcomeOrgController implements WelcomeOrgControllerAPI {
     }
 
     @Override
-    public CommonResult getMajors(Integer collegeId) {
+    public CommonResult getMajors(int collegeId) {
         List<WelcomeOrg> majors = welcomeOrgService.queryMajors(collegeId);
 
         List<ListVo> result = new ArrayList<>();
@@ -58,7 +58,7 @@ public class WelcomeOrgController implements WelcomeOrgControllerAPI {
     }
 
     @Override
-    public CommonResult getClasss(Integer majorId) {
+    public CommonResult getClasss(int majorId) {
         List<WelcomeOrg> classs = welcomeOrgService.queryClasss(majorId);
 
         List<ListVo> result = new ArrayList<>();
@@ -70,5 +70,8 @@ public class WelcomeOrgController implements WelcomeOrgControllerAPI {
         }
         return CommonResult.ok(result);
     }
+
+
+
 }
 

src/main/java/com/template/controller/WelcomeStudentDormitoryController.java

@@ -34,11 +34,8 @@ import java.util.List;
  * @since 2025-06-13
  */
 @RestController
-<<<<<<< HEAD
+
 public class WelcomeStudentDormitoryController implements WelcomeStudentDormitoryControllerAPI {
-=======
-public class WelcomeStudentDormitoryController {
->>>>>>> fc9ba255cfc10a702863cc05b02a4b0f4b58cf94
 
     @Autowired
     WelcomeStudentDormitoryService welcomeStudentDormitoryService;