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

# Conflicts:
#	scripts/admin-test-env-modules/phase4-overseas-pda.mjs

order/src/main/java/com/baiyue/order/repository/OrderRepository.java

@@ -115,7 +115,9 @@ public class OrderRepository {
             .eq(OutboxEventEntity::getPublishStatus, "PENDING")
             .and(v -> v.isNull(OutboxEventEntity::getNextRetryAt)
                 .or().le(OutboxEventEntity::getNextRetryAt, LocalDateTime.now()))
-            .orderByAsc(OutboxEventEntity::getCreatedAt)
+            // Approval and its first declaration update can share the same DB timestamp.
+            // Keep the insertion order deterministic so the inbound exists before its update is delivered.
+            .orderByAsc(OutboxEventEntity::getCreatedAt, OutboxEventEntity::getId)
             .last("LIMIT " + Math.min(Math.max(limit, 1), 100)));
     }
     public void markOutboxPublished(long tenantId, long id, LocalDateTime publishedAt) {

order/src/test/java/com/baiyue/order/repository/OrderRepositoryIsolationUpdateTest.java

@@ -147,7 +147,7 @@ class OrderRepositoryIsolationUpdateTest {
         ArgumentCaptor<Wrapper<OutboxEventEntity>> wrapper = ArgumentCaptor.forClass(Wrapper.class);
         verify(mapper).selectList(wrapper.capture());
         assertThat(wrapper.getValue().getSqlSegment())
-            .contains("aggregate_type", "publish_status")
+            .contains("aggregate_type", "publish_status", "created_at", "id")
             .doesNotContain("event_type");
         assertThat(params(wrapper.getValue()).values())
             .contains("FIRST_LEG_ORDER", "PENDING");