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/消耗品订单List.json | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 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\225List.json" "b/force-app/main/default/experiences/Consumable_21/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225List.json"
index 57473fa..c4df577 100644
--- "a/force-app/main/default/experiences/Consumable_21/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225List.json"
+++ "b/force-app/main/default/experiences/Consumable_21/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225List.json"
@@ -1,52 +1,52 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "c9f4f647-56ee-42d8-a323-0e34383a4ec2",
- "label": "娑堣�楀搧璁㈠崟 List",
- "regions": [
- {
- "id": "1b06df73-32d3-48b7-93e9-086b7f64c126",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "c9f4f647-56ee-42d8-a323-0e34383a4ec2",
+ "label": "娑堣�楀搧璁㈠崟 List",
+ "regions": [
{
- "componentAttributes": {
- "enableInlineEdit": false,
- "filterName": "{!filterId}",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "{!objectName}",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "1de998fc-a513-4f6e-859d-9c7041a7fc21",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "1b06df73-32d3-48b7-93e9-086b7f64c126",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "enableInlineEdit": false,
+ "filterName": "{!filterId}",
+ "layout": "FULL",
+ "pageSize": 25,
+ "scope": "{!objectName}",
+ "showActionBar": true,
+ "showChartsPanel": true,
+ "showDisplay": "showall",
+ "showFilterPanel": true,
+ "showImageIcon": true,
+ "showManualRefreshButton": true,
+ "showObjectName": true,
+ "showPinnedList": true,
+ "showSearchBar": true
+ },
+ "componentName": "forceCommunity:objectHome",
+ "id": "1de998fc-a513-4f6e-859d-9c7041a7fc21",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "948b39de-c179-4cd1-8455-971e89dfe76f",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "01f672e2-ff7c-48f2-a2a8-652c1fb8dff3",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "948b39de-c179-4cd1-8455-971e89dfe76f",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "01f672e2-ff7c-48f2-a2a8-652c1fb8dff3",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-a2K"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-a2K"
}
--
Gitblit v1.9.1