Merge remote-tracking branch 'origin/test' into dev

# Conflicts:
#	lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/gateway/WarehouseResourceGateway.java
#	scripts/admin-test-env-modules/phase3-container-documents-contract.test.mjs
#	scripts/admin-test-env-modules/phase4-overseas-pda.mjs

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanQueryMapper.java

@@ -44,7 +44,8 @@ public interface InboundPlanQueryMapper {
         "o.customer_name customerName,l.required_package_count packageCount," +
         "COALESCE((SELECT SUM(pa.picked_package_count) FROM ll_inbound_plan_pallet_allocation pa WHERE pa.line_id=l.id),0) pickedPackageCount," +
         "l.volume_cbm volumeCbm," +
-        "l.planned_pallet_count palletCount,p.status status,a.appointment_no appointmentNo," +
+        "l.planned_pallet_count palletCount,p.assigned_flag assigned,p.merge_required mergeAllowed," +
+        "p.urgent_flag urgent,p.status status,a.appointment_no appointmentNo," +
         "a.appointment_status appointmentStatus,a.appointment_at appointmentAt," +
         "a.expected_loading_at expectedLoadingAt," +
         "CASE WHEN EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE " +