fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/experiences/Consumable1/routes/ÏûºÄÆ·¶©µ¥ÏêϸÐÅÏ¢.json

@@ -1,10 +1,10 @@
{
  "activeViewId": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "7283136d-99d5-4982-bb41-02e2ebc00e5a",
  "label": "消耗品订单 è¯¦ç»†ä¿¡æ¯",
  "objectApiName": "Consumable_order__c",
  "routeType": "detail-a2K",
  "type": "route",
  "urlPrefix": "consumable-order"
    "activeViewId": "edf32642-ece4-4435-94c9-82eb6b8f67a9",
    "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
    "id": "e7af9c90-036b-4cee-921f-06d6ef72f826",
    "label": "消耗品订单 è¯¦ç»†ä¿¡æ¯",
    "objectApiName": "Consumable_order__c",
    "routeType": "detail-a2K",
    "type": "route",
    "urlPrefix": "consumable-order"
}