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/Consumable_21/views/消耗品订单Detail.json | 138 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 69 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable_21/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225Detail.json" "b/force-app/main/default/experiences/Consumable_21/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225Detail.json"
index 429892e..de8ce25 100644
--- "a/force-app/main/default/experiences/Consumable_21/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225Detail.json"
+++ "b/force-app/main/default/experiences/Consumable_21/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225Detail.json"
@@ -1,76 +1,76 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "1691b1e6-3801-4345-8e26-61efe24a1221",
- "label": "娑堣�楀搧璁㈠崟 Detail",
- "regions": [
- {
- "id": "4dfafba4-ebb9-421b-84d5-1dd47087b3d6",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "1691b1e6-3801-4345-8e26-61efe24a1221",
+ "label": "娑堣�楀搧璁㈠崟 Detail",
+ "regions": [
{
- "componentAttributes": {
- "recordId": "{!recordId}"
- },
- "componentName": "forceCommunity:recordHeadline",
- "id": "9a16b291-bb52-4fbe-82bd-afb0596a71a1",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "4dfafba4-ebb9-421b-84d5-1dd47087b3d6",
+ "regionName": "header",
+ "type": "region"
},
{
- "componentAttributes": {
- "detailsTabLabel": "Details",
- "discussionsTabLabel": "Feed",
- "recordId": "{!recordId}",
- "relatedTabLabel": "Related",
- "showLegacyActivityComposer": false,
- "tab1Type": "details",
- "tab2Type": "related",
- "tab3Type": "chatter",
- "tab4Type": "none",
- "timelineTabLabel": "Activity"
- },
- "componentName": "forceCommunity:recordHomeTabs",
- "id": "c9ce8c2d-a67f-49b7-b5b7-10eda3f11221",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "e9ba4418-9650-4cbb-95c8-48d950f36b96",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "edc5392e-c836-4e2e-876b-ddadb2938087",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!recordId}"
+ },
+ "componentName": "forceCommunity:recordHeadline",
+ "id": "9a16b291-bb52-4fbe-82bd-afb0596a71a1",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "detailsTabLabel": "Details",
+ "discussionsTabLabel": "Feed",
+ "recordId": "{!recordId}",
+ "relatedTabLabel": "Related",
+ "showLegacyActivityComposer": false,
+ "tab1Type": "details",
+ "tab2Type": "related",
+ "tab3Type": "chatter",
+ "tab4Type": "none",
+ "timelineTabLabel": "Activity"
+ },
+ "componentName": "forceCommunity:recordHomeTabs",
+ "id": "c9ce8c2d-a67f-49b7-b5b7-10eda3f11221",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "e9ba4418-9650-4cbb-95c8-48d950f36b96",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "{!Record._Object}: {!Record._Title}"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "af55a81d-0722-4809-9ebc-fe919fafc20d",
- "renditionMap": {},
- "type": "component"
+ "id": "edc5392e-c836-4e2e-876b-ddadb2938087",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "af55a81d-0722-4809-9ebc-fe919fafc20d",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "c5d8d626-e408-4614-98ba-c5d7f05b4dc5",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "c5d8d626-e408-4614-98ba-c5d7f05b4dc5",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "detail-a2K"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-a2K"
}
--
Gitblit v1.9.1