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/Site3/routes/奥林巴斯电子签收系统.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git "a/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
index f4fa600..6a28d4a 100644
--- "a/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "224c5f58-859e-49e8-9564-18d11e2ddf47",
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "id": "819d167a-e9e0-46e2-be56-8e5e20dc4a0e",
- "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
- "pageAccess": "Public",
- "routeType": "custom-esign-data-entry",
- "type": "route",
- "urlPrefix": "EsignDataEntry"
+ "activeViewId": "224c5f58-859e-49e8-9564-18d11e2ddf47",
+ "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "id": "819d167a-e9e0-46e2-be56-8e5e20dc4a0e",
+ "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
+ "pageAccess": "Public",
+ "routeType": "custom-esign-data-entry",
+ "type": "route",
+ "urlPrefix": "EsignDataEntry"
}
--
Gitblit v1.9.1