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/lexOverdueStock.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json b/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
index f7f09e9..2b7fb7d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
@@ -1,10 +1,10 @@
{
- "activeViewId": "38d1e97a-0728-46a2-bee1-0c72ff1d6570",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "73006608-6ed7-459c-b9bc-14c6c16476f4",
- "label": "LexOverdueStock",
- "pageAccess": "UseParent",
- "routeType": "custom-lexoverduestock",
- "type": "route",
- "urlPrefix": "lexoverduestock"
+ "activeViewId": "b0f2e8e7-62fd-42f3-bf3a-4bdf40b02bf4",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "2c0812bd-c08f-4e4a-980f-360b54f841c4",
+ "label": "LexOverdueStock",
+ "pageAccess": "UseParent",
+ "routeType": "custom-lexoverduestock",
+ "type": "route",
+ "urlPrefix": "lexoverduestock"
}
--
Gitblit v1.9.1