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

@@ -1313,7 +1313,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         }
         needMergeLivingOrders.forEach(s->{
             s.setBeforeMergeBookingOrderId(s.getBookingOrderId());
-            s.setBookingOrderId(mergeLivingOrder.getBookingOrderId());
+            s.setBookingOrderId(livingOrder.getBookingOrderId());
         });
         roomsLivingOrderService.updateBatchById(needMergeLivingOrders);
         return true;