fix: Merge conflicts resolved in backend folder

backend/dataconnect/connector/order/mutations.gql

@@ -2,6 +2,7 @@ mutation createOrder(
   $vendorId: UUID
   $businessId: UUID!
   $orderType: OrderType!
+  #$location: String
   $status: OrderStatus
   $date: Timestamp
   $startDate: Timestamp
@@ -13,6 +14,7 @@ mutation createOrder(
   $assignedStaff: Any
   $shifts: Any
   $requested: Int
+  $teamHubId: UUID!
   $recurringDays: Any
   $permanentStartDate: Timestamp
   $permanentDays: Any
@@ -25,6 +27,7 @@ mutation createOrder(
       vendorId: $vendorId
       businessId: $businessId
       orderType: $orderType
+      #location: $location
       status: $status
       date: $date
       startDate: $startDate
@@ -36,6 +39,7 @@ mutation createOrder(
       assignedStaff: $assignedStaff
       shifts: $shifts
       requested: $requested
+      teamHubId: $teamHubId
       recurringDays: $recurringDays
       permanentDays: $permanentDays
       notes: $notes
@@ -49,6 +53,7 @@ mutation updateOrder(
   $id: UUID!
   $vendorId: UUID
   $businessId: UUID
+  #$location: String
   $status: OrderStatus
   $date: Timestamp
   $startDate: Timestamp
@@ -58,6 +63,7 @@ mutation updateOrder(
   $assignedStaff: Any
   $shifts: Any
   $requested: Int
+  $teamHubId: UUID!
   $recurringDays: Any
   $permanentDays: Any
   $notes: String
@@ -69,6 +75,7 @@ mutation updateOrder(
     data: {
       vendorId: $vendorId
       businessId: $businessId
+      #location: $location
       status: $status
       date: $date
       startDate: $startDate
@@ -78,6 +85,7 @@ mutation updateOrder(
       assignedStaff: $assignedStaff
       shifts: $shifts
       requested: $requested
+      teamHubId: $teamHubId
       recurringDays: $recurringDays
       permanentDays: $permanentDays
       notes: $notes
@@ -89,4 +97,4 @@ mutation updateOrder(
 
 mutation deleteOrder($id: UUID!) @auth(level: USER) {
   order_delete(id: $id) 
-}
+}