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

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

@@ -157,7 +157,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
         WelcomeDormitory one = welcomeDormitoryService.getById(welcomeDormitory.getId());
         if (one == null) {
-            return CommonResult.fail("宿舍号信息已存在");
+            return CommonResult.fail("宿舍信息已失效");
         }
 
         //List<WelcomeBed> beds = welcomeBedService.queryDormitorys(one.getId());