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/Consumable1/routes/消耗品订单详细信息.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
index 9b0a5e6..7a5ebd0 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "7283136d-99d5-4982-bb41-02e2ebc00e5a",
- "label": "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
- "objectApiName": "Consumable_order__c",
- "routeType": "detail-a2K",
- "type": "route",
- "urlPrefix": "consumable-order"
+ "activeViewId": "edf32642-ece4-4435-94c9-82eb6b8f67a9",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "e7af9c90-036b-4cee-921f-06d6ef72f826",
+ "label": "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
+ "objectApiName": "Consumable_order__c",
+ "routeType": "detail-a2K",
+ "type": "route",
+ "urlPrefix": "consumable-order"
}
--
Gitblit v1.9.1