fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/networks/Consumableϵͳ.network-meta.xml

@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<Network xmlns="http://soap.sforce.com/2006/04/metadata">
    <allowInternalUserLogin>false</allowInternalUserLogin>
    <allowMembersToFlag>false</allowMembersToFlag>
    <changePasswordTemplate>unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
    <communityRoles/>
    <disableReputationRecordConversations>false</disableReputationRecordConversations>
    <changePasswordTemplate
    >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
    <communityRoles />
    <disableReputationRecordConversations
    >false</disableReputationRecordConversations>
    <emailSenderAddress>buli@deloitte.com.cn</emailSenderAddress>
    <emailSenderName>Consumable系统</emailSenderName>
    <enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
@@ -24,18 +26,22 @@
    <enableTopicAssignmentRules>true</enableTopicAssignmentRules>
    <enableTopicSuggestions>false</enableTopicSuggestions>
    <enableUpDownVote>false</enableUpDownVote>
    <forgotPasswordTemplate>unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
    <forgotPasswordTemplate
    >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
    <gatherCustomerSentimentData>false</gatherCustomerSentimentData>
    <networkMemberGroups>
        <permissionSet>Community_LEX_PS</permissionSet>
        <permissionSet>Community_Consumable_LEX_PS</permissionSet>
        <profile>admin</profile>
    </networkMemberGroups>
    <networkPageOverrides>
        <changePasswordPageOverrideSetting>Standard</changePasswordPageOverrideSetting>
        <forgotPasswordPageOverrideSetting>Designer</forgotPasswordPageOverrideSetting>
        <changePasswordPageOverrideSetting
        >Standard</changePasswordPageOverrideSetting>
        <forgotPasswordPageOverrideSetting
        >Designer</forgotPasswordPageOverrideSetting>
        <homePageOverrideSetting>Designer</homePageOverrideSetting>
        <loginPageOverrideSetting>Designer</loginPageOverrideSetting>
        <selfRegProfilePageOverrideSetting>Designer</selfRegProfilePageOverrideSetting>
        <selfRegProfilePageOverrideSetting
        >Designer</selfRegProfilePageOverrideSetting>
    </networkPageOverrides>
    <picassoSite>Consumable1</picassoSite>
    <selfRegistration>false</selfRegistration>
@@ -47,5 +53,6 @@
        <standardTab>Chatter</standardTab>
    </tabs>
    <urlPathPrefix>consumable</urlPathPrefix>
    <welcomeTemplate>unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
    <welcomeTemplate
    >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
</Network>