Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

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

@@ -123,7 +123,7 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
 
         LambdaQueryWrapper<WelcomeBuild> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(schoolName),WelcomeBuild::getSchool,schoolName)
-                .groupBy(WelcomeBuild::getSchool);
+                .groupBy(WelcomeBuild::getBuild);
         List<WelcomeBuild> schoolGroup = welcomeBuildService.list(wrapper);
 
         return CommonResult.ok(schoolGroup);

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

@@ -64,6 +64,8 @@ public class WelcomeStudentDormitoryController implements WelcomeStudentDormitor
         return CommonResult.ok();
     }
 
+
+
     @Override
     public CommonResult submit(WelcomeStudentDormitory welcomeStudentDormitory) {
         String studentCard = welcomeStudentDormitory.getStudentCard();