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

# Conflicts:
#	scripts/admin-test-env-modules/inbound-fees-contract.test.mjs

scripts/admin-test-env-modules/inbound-fees-contract.test.mjs

@@ -34,3 +34,8 @@ test('initial fee preparation is reusable without confirming or publishing the f
   assert.match(helper, /feeStatus === 'CALCULATED'/)
   assert.doesNotMatch(helper, /\/fees\/confirm|\/fees\/send/)
 })
+
+test('automatic fee adjustment confirms the ten percent tolerance boundary', async () => {
+  const source = await readFile(moduleFile, 'utf8')
+  assert.match(source, /reason: `\$\{context\.marker\}-自动费用版本调整`, toleranceConfirmed: true/)
+})

scripts/admin-test-env-modules/initialization-baseline-contract.test.mjs

@@ -50,6 +50,14 @@ test('国内统一初始化支持真实空库且不越界创建海外业务库',
   )
 })
 
+test('国内统一初始化补齐入库费用人工调整基线字段', () => {
+  assert.match(sql, /baseline_chargeable_quantity DECIMAL\(18,6\) NOT NULL/)
+  assert.match(sql, /SET baseline_chargeable_quantity = chargeable_quantity[\s\S]*?WHERE baseline_chargeable_quantity IS NULL/)
+  assert.match(sql, /tolerance_percent DECIMAL\(5,2\) NOT NULL DEFAULT 10\.00/)
+  assert.match(sql, /unified_assert_column\('baiyue_firstleg', 'fl_inbound_fee', 'baseline_chargeable_quantity'\)/)
+  assert.match(sql, /unified_assert_column\('baiyue_firstleg', 'fl_inbound_fee', 'tolerance_percent'\)/)
+})
+
 test('三期权限迁移删除退役权限并只保留 canonical 权限', () => {
   for (const source of [sql, oceanBookingSchema]) {
     assert.match(source, /DELETE FROM iam_permission WHERE id IN \(5102141,5102143,5102144,5102145\)/)