Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -1304,8 +1304,10 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             needMergeLivingOrders.addAll(relationOtherLivingOrders);
 
             BusBookingRooms mainBkRoom = bookingRoomsService.getOne(Wrappers.<BusBookingRooms>query().eq("booking_orders_id",bookingRooms.getBookingOrdersId()));
-            if(mainBkRoom != null) mainBkRoom.setIsMain(true);
-            bookingRoomsService.updateById(mainBkRoom); // 设置预约的主房
+            if(mainBkRoom != null) {
+                mainBkRoom.setIsMain(true);
+                bookingRoomsService.updateById(mainBkRoom); // 设置预约的主房
+            }
         } else {
             needMergeLivingOrders.add(mergeLivingOrder);
         }