Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtAreaServiceImpl.java

@@ -593,5 +593,8 @@ public class PtAreaServiceImpl implements IPtAreaService {
             floorRoomsVo.setOrderList(ordersMap.get(guestRoom.getRoomCode()));
             rs.add(floorRoomsVo);
         }
+        //根据 room的 roomCode 升序排序
+        rs.sort(Comparator.comparing(e -> e.getRoom() != null ? e.getRoom().getRoomCode() : null, Comparator.nullsLast(Comparator.naturalOrder())));
+
     }
 }