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/lexConsumableAccountInfoPrint.json |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
index dc404f5..93a0332 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
@@ -1,10 +1,10 @@
 {
-  "activeViewId": "469dc013-dd9c-46d5-a4e8-57e7b4718b74",
-  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
-  "id": "0b5b4633-9d43-4758-a5a1-7f3048846a66",
-  "label": "LexConsumableAccountInfoPrint",
-  "pageAccess": "UseParent",
-  "routeType": "custom-lexconsumableaccountinfoprint",
-  "type": "route",
-  "urlPrefix": "lexconsumableaccountinfoprint"
+    "activeViewId": "5d615179-dd62-4481-a874-de16a69d7374",
+    "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+    "id": "82091f6c-517f-4ee0-8ad2-8958cf953804",
+    "label": "LexConsumableAccountInfoPrint",
+    "pageAccess": "UseParent",
+    "routeType": "custom-lexconsumableaccountinfoprint",
+    "type": "route",
+    "urlPrefix": "lexconsumableaccountinfoprint"
 }

--
Gitblit v1.9.1