Merge remote-tracking branch 'origin/dev' into pre

src/main/java/com/xjrsoft/module/room/controller/RoomBedAdjustController.java

@@ -87,7 +87,7 @@ public class RoomBedAdjustController {
         List<BaseClass> classList = baseClassService.list(
                 new QueryWrapper<BaseClass>().lambda().eq(BaseClass::getTeacherId, teacherId)
         );
-        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER") && dto.getRoomId() != null){
+        if(roleList.size() == 2 && roleList.contains("CLASSTE") && roleList.contains("TEACHER") && dto.getRoomId() == null){
             if(classList != null && !classList.isEmpty()){
                 dto.setClassId(classList.get(0).getId());
             }