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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
index e5b91a5..3ae8a21 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
@@ -1,10 +1,10 @@
{
- "activeViewId" : "293921b6-1a37-49a3-a225-be2f3471a41c",
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "id" : "9d3bd2d5-0b87-4b44-adad-6044a25d08aa",
- "label" : "娑堣�楀搧璁㈠崟 鍒楄〃",
- "objectApiName" : "Consumable_order__c",
- "routeType" : "list-a2K",
- "type" : "route",
- "urlPrefix" : "consumable-order"
-}
\ No newline at end of file
+ "activeViewId": "293921b6-1a37-49a3-a225-be2f3471a41c",
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "id": "9d3bd2d5-0b87-4b44-adad-6044a25d08aa",
+ "label": "娑堣�楀搧璁㈠崟 鍒楄〃",
+ "objectApiName": "Consumable_order__c",
+ "routeType": "list-a2K",
+ "type": "route",
+ "urlPrefix": "consumable-order"
+}
--
Gitblit v1.9.1