From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Consumable_21/routes/消耗品订单List.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable_21/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225List.json" "b/force-app/main/default/experiences/Consumable_21/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225List.json"
index cfea17f..1927045 100644
--- "a/force-app/main/default/experiences/Consumable_21/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225List.json"
+++ "b/force-app/main/default/experiences/Consumable_21/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225List.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "c9f4f647-56ee-42d8-a323-0e34383a4ec2",
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "id": "c945e6e5-2fc5-4966-bfc0-09183e1ac76b",
- "label": "娑堣�楀搧璁㈠崟 List",
- "objectApiName": "Consumable_order__c",
- "routeType": "list-a2K",
- "type": "route",
- "urlPrefix": "consumable-order"
+ "activeViewId": "c9f4f647-56ee-42d8-a323-0e34383a4ec2",
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "id": "c945e6e5-2fc5-4966-bfc0-09183e1ac76b",
+ "label": "娑堣�楀搧璁㈠崟 List",
+ "objectApiName": "Consumable_order__c",
+ "routeType": "list-a2K",
+ "type": "route",
+ "urlPrefix": "consumable-order"
}
--
Gitblit v1.9.1