fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/experiences/Site3/views/奥林巴斯电子签收系统.json

@@ -1,46 +1,55 @@
{
  "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
  "componentName" : "siteforce:sldsOneColLayout",
  "dataProviders" : [ ],
  "id" : "224c5f58-859e-49e8-9564-18d11e2ddf47",
  "label" : "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
  "regions" : [ {
    "id" : "518d33a9-c0b3-4d07-bc99-314ad3b41419",
    "regionName" : "header",
    "type" : "region"
  }, {
    "components" : [ {
      "componentAttributes" : { },
      "componentName" : "c:eSignHomePage",
      "id" : "ea68fcac-c35d-415e-86e8-040f4a6820d5",
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "6ff94da4-7138-452e-a15c-ddfbb167b364",
    "regionName" : "content",
    "type" : "region"
  }, {
    "id" : "c7a5b214-989d-437e-b11b-19c533e37cf3",
    "regionName" : "footer",
    "type" : "region"
  }, {
    "components" : [ {
      "componentAttributes" : {
        "customHeadTags" : "",
        "description" : "",
        "title" : "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺"
      },
      "componentName" : "forceCommunity:seoAssistant",
      "id" : "528b9108-2ebf-4ba1-8e2b-9ebec00fa61a",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "d2699d17-8cc3-4386-a7db-72e53dea52e4",
    "regionName" : "sfdcHiddenRegion",
    "type" : "region"
  } ],
  "themeLayoutType" : "Inner",
  "type" : "view",
  "viewType" : "custom-esign-data-entry"
}
    "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
    "componentName": "siteforce:sldsOneColLayout",
    "dataProviders": [],
    "id": "224c5f58-859e-49e8-9564-18d11e2ddf47",
    "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
    "regions": [
        {
            "id": "518d33a9-c0b3-4d07-bc99-314ad3b41419",
            "regionName": "header",
            "type": "region"
        },
        {
            "components": [
                {
                    "componentAttributes": {},
                    "componentName": "c:eSignHomePage",
                    "id": "ea68fcac-c35d-415e-86e8-040f4a6820d5",
                    "renderPriority": "NEUTRAL",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "6ff94da4-7138-452e-a15c-ddfbb167b364",
            "regionName": "content",
            "type": "region"
        },
        {
            "id": "c7a5b214-989d-437e-b11b-19c533e37cf3",
            "regionName": "footer",
            "type": "region"
        },
        {
            "components": [
                {
                    "componentAttributes": {
                        "customHeadTags": "",
                        "description": "",
                        "title": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺"
                    },
                    "componentName": "forceCommunity:seoAssistant",
                    "id": "528b9108-2ebf-4ba1-8e2b-9ebec00fa61a",
                    "renditionMap": {},
                    "type": "component"
                }
            ],
            "id": "d2699d17-8cc3-4386-a7db-72e53dea52e4",
            "regionName": "sfdcHiddenRegion",
            "type": "region"
        }
    ],
    "themeLayoutType": "Inner",
    "type": "view",
    "viewType": "custom-esign-data-entry"
}