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/objects/Repair__c/fields/OSH_DOJ_Mail__c.field-meta.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/force-app/main/default/objects/Repair__c/fields/OSH_DOJ_Mail__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/OSH_DOJ_Mail__c.field-meta.xml index e6c245f..758f82d 100644 --- a/force-app/main/default/objects/Repair__c/fields/OSH_DOJ_Mail__c.field-meta.xml +++ b/force-app/main/default/objects/Repair__c/fields/OSH_DOJ_Mail__c.field-meta.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <CustomField xmlns="http://soap.sforce.com/2006/04/metadata"> <fullName>OSH_DOJ_Mail__c</fullName> - <defaultValue>'IT_Prectech@olympus.com.cn'</defaultValue> + <defaultValue>'OSH-SFDC-member@olympus.com.cn'</defaultValue> <externalId>false</externalId> <label>OSH_DOJ_Mail</label> <required>false</required> -- Gitblit v1.9.1