merge release test changes and preserve local frontend updates

src/modules/overseas-warehouse/api/lastMileOrders.ts

@@ -364,6 +364,15 @@ export async function getLastMileOrder(orderId: string) {
   return unwrapApiResponse(response)
 }
 
+export async function reviewReturnOrder(returnNo: string, customerId: string, decision: 'APPROVE' | 'REJECT', remark?: string) {
+  const response = await overseasHttp.post<ApiEnvelope<unknown>, ApiEnvelope<unknown>>(
+    `/platform/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/review`,
+    { decision, remark: remark?.trim() || undefined },
+    { headers: { 'X-Customer-Id': customerId } },
+  )
+  return unwrapApiResponse(response)
+}
+
 export async function downloadLastMileOrders(query: Partial<LastMileOrderQuery>) {
   const { page: _page, size: _size, ...filters } = query
   const params = Object.fromEntries(

src/modules/overseas-warehouse/api/relabelOrders.ts

@@ -98,6 +98,7 @@ export interface RelabelItemDto {
   cartonMark?: string | null
   fbaCartonMark?: string | null
   destinationWarehouseId?: string | null
+  destinationFbaWarehouseCode?: string | null
 }
 
 export interface RelabelHistoryDto {