From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
manifest/LEXC01packagelexcommunitynew.xml | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/manifest/LEXC01packagelexcommunitynew.xml b/manifest/LEXC01packagelexcommunitynew.xml
index 6bb0960..1ad35f9 100644
--- a/manifest/LEXC01packagelexcommunitynew.xml
+++ b/manifest/LEXC01packagelexcommunitynew.xml
@@ -1,38 +1,71 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>02_LEXCommunity_New_6%2E0</fullName>
<types>
+ <members>Batch_FixAttachmentToFiles</members>
+ <members>Batch_FixAttachmentToFilesTest</members>
<members>LexArriveGoodsMainController</members>
+ <members>LexArriveGoodsMainControllerTest</members>
<members>LexArriveGsDetailsController</members>
+ <members>LexArriveGsDetailsControllerTest</members>
<members>LexCancelRemoveBoxController</members>
+ <members>LexCancelRemoveBoxControllerTest</members>
<members>LexConInvoiceList</members>
+ <members>LexConInvoiceListTest</members>
<members>LexConInvoiceViewController</members>
+ <members>LexConInvoiceViewControllerTest</members>
<members>LexConInvoicedetailsController</members>
+ <members>LexConInvoicedetailsControllerTest</members>
<members>LexConsumableAccountController</members>
+ <members>LexConsumableAccountControllerTest</members>
<members>LexConsumableAccountInfoController</members>
+ <members>LexConsumableAccountInfoControllerTest</members>
<members>LexConsumableAccountSOQL</members>
+ <members>LexConsumableAccountSOQLTest</members>
<members>LexConsumableController</members>
+ <members>LexConsumableControllerTest</members>
<members>LexConsumableGoodsInfo</members>
+ <members>LexConsumableGoodsInfoTest</members>
<members>LexConsumableOrderManageController</members>
- <members>LexDealerInquiryModifyStateController</members>
+ <members>LexConsumableOrderManageControllerTest</members>
<members>LexInventoryController</members>
+ <members>LexInventoryControllerTest</members>
<members>LexInventoryListController</members>
+ <members>LexInventoryListControllerTest</members>
<members>LexInventoryViewController</members>
+ <members>LexInventoryViewControllerTest</members>
<members>LexLicenceReminderController</members>
+ <members>LexLicenceReminderControllerTest</members>
<members>LexOutboundorderImportController</members>
+ <members>LexOutboundorderImportControllerTest</members>
<members>LexOverdueStockController</members>
+ <members>LexOverdueStockControllerTest</members>
<members>LexProductLimitEditController</members>
+ <members>LexProductLimitEditControllerTest</members>
<members>LexRemoveBoxController</members>
+ <members>LexRemoveBoxControllerTest</members>
<members>LexSaleAndDeliveryController</members>
+ <members>LexSaleAndDeliveryControllerTest</members>
<members>LexSaleOrderController</members>
+ <members>LexSaleOrderControllerTest</members>
<members>LexSearchContractController</members>
+ <members>LexSearchContractControllerTest</members>
<members>LexSearchHospitalController</members>
+ <members>LexSearchHospitalControllerTest</members>
<members>LexSummonsCreatController</members>
+ <members>LexSummonsCreatControllerTest</members>
<members>LexTopPageController</members>
+ <members>LexTopPageControllerTest</members>
<members>LexUpAccountProLimit</members>
+ <members>LexUpAccountProLimitControllerTest</members>
<members>LexUtility</members>
+ <members>LexUtilityTest</members>
<members>LookupSearchResult</members>
+ <members>LookupSearchResultTest</members>
<members>ResponseBodyLWC</members>
+ <members>ResponseBodyLWCTest</members>
<members>lexSearchAgencyHospitalController</members>
+ <members>lexSearchAgencyHospitalControllerTest</members>
<name>ApexClass</name>
</types>
<types>
@@ -44,7 +77,10 @@
<types>
<members>boxorpieceType</members>
<members>commonToast</members>
+ <members>customAccountUrlComp</members>
+ <members>customDeleteReasonComp</members>
<members>customLightningDatatable</members>
+ <members>customMydrComp</members>
<members>customOutboundCountComp</members>
<members>customOutputGood</members>
<members>customShipmentAmountComp</members>
@@ -69,7 +105,6 @@
<members>lexCustomInventoryColor</members>
<members>lexCustomLightningDatatable</members>
<members>lexCustomTableInput</members>
- <members>lexDealerInquiryModifyState</members>
<members>lexInventory</members>
<members>lexLicenceReminder</members>
<members>lexLookup</members>
@@ -86,16 +121,13 @@
<members>lexinventoryViewLWC</members>
<members>lwcDatatableUtility</members>
<members>myCustomTypeDatatable</members>
- <members>paginator</members>
<members>navigateToRecord</members>
+ <members>paginator</members>
<name>LightningComponentBundle</name>
</types>
<types>
- <members>invoiceStart</members>
- <members>View_Weekly_Report</members>
- <members>LexConInvoiceViewReport</members>
- <members>LexArrivegsDetailsPageHelpText</members>
- <name>CustomLabel</name>
+ <members>Community_Consumable_LEX_PS</members>
+ <name>PermissionSet</name>
</types>
- <version>57.0</version>
-</Package>
\ No newline at end of file
+ <version>50.0</version>
+</Package>
--
Gitblit v1.9.1