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/lexArriveGoodsMain.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
index d144063..4e761fd 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "e8d527e1-b86c-4449-bf5c-1ed05301648b",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "8e439ddc-a758-4cba-a5f8-c3295fc7349a",
- "label": "LexArriveGoodsMain",
- "pageAccess": "UseParent",
- "routeType": "custom-lexarrivegoodsmain",
- "type": "route",
- "urlPrefix": "lexarrivegoodsmain"
+ "activeViewId": "f46aba62-01c3-4a20-93c6-f9b2362717e6",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "372e3324-9c48-41ca-8e6d-4b349f076f65",
+ "label": "LexArriveGoodsMain",
+ "pageAccess": "UseParent",
+ "routeType": "custom-lexarrivegoodsmain",
+ "type": "route",
+ "urlPrefix": "lexarrivegoodsmain"
}
--
Gitblit v1.9.1