merge: integrate TEST updates and verify appointment release

iam/src/test/java/com/baiyue/iam/repository/MerchantReturnInventoryPermissionSqlContractTest.java

@@ -20,7 +20,7 @@ class MerchantReturnInventoryPermissionSqlContractTest {
         assertThat(sql).contains(
             "(5306140,0,'MERCHANT','MENU',0,'" + PERMISSION + "','退货库存'",
             "role.role_code='MERCHANT_OWNER'",
-            ")) <> 24 THEN",
+            ")) <> 25 THEN",
             "客户默认管理员授权不完整");
 
         int grantStart = sql.indexOf("-- 客户默认管理员获得当前客户海外业务入口");

iam/src/test/java/com/baiyue/iam/repository/OverseasCustomerPermissionSqlContractTest.java

@@ -36,6 +36,7 @@ class OverseasCustomerPermissionSqlContractTest {
         "merchant:overseas-warehouse:discard:list",
         "merchant:overseas-warehouse:discard:create",
         "merchant:overseas-warehouse:discard:cancel",
+        "merchant:overseas-warehouse:discard:confirm",
         "merchant:overseas-warehouse:return-order:list",
         "merchant:overseas-warehouse:return-order:create",
         "merchant:overseas-warehouse:return-order:relabel");
@@ -85,7 +86,7 @@ class OverseasCustomerPermissionSqlContractTest {
             "海外客户权限初始化失败：客户默认管理员授权不完整",
             "permission.app_code='MERCHANT'",
             "role.role_code='MERCHANT_OWNER'",
-            ")) <> 24 THEN");
+            ")) <> 25 THEN");
     }
 
     @Test