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\226\260\345\273\272\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\226\260\345\273\272\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225.json"
index a0b81a5..a293c29 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\226\260\345\273\272\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\226\260\345\273\272\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225.json"
@@ -1,10 +1,10 @@
{
- "activeViewId": "375bc286-f467-4c6c-a3e1-be4bfbf27bea",
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "id": "bd66f475-4bea-4c64-a6c4-8ed16d217742",
- "label": "鏂板缓娑堣�楀搧璁㈠崟",
- "pageAccess": "UseParent",
- "routeType": "custom-neworder",
- "type": "route",
- "urlPrefix": "neworder"
+ "activeViewId": "375bc286-f467-4c6c-a3e1-be4bfbf27bea",
+ "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+ "id": "bd66f475-4bea-4c64-a6c4-8ed16d217742",
+ "label": "鏂板缓娑堣�楀搧璁㈠崟",
+ "pageAccess": "UseParent",
+ "routeType": "custom-neworder",
+ "type": "route",
+ "urlPrefix": "neworder"
}
--
Gitblit v1.9.1