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/Agency_Opportunity__c/fields/Fund_Basis__c.field-meta.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/fields/Fund_Basis__c.field-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/fields/Fund_Basis__c.field-meta.xml
index 29c48d0..7155406 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/fields/Fund_Basis__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/fields/Fund_Basis__c.field-meta.xml
@@ -43,6 +43,11 @@
<label>铻嶈祫绉熻祦锛堛儶銉笺偣锛�</label>
</value>
<value>
+ <fullName>璐存伅璐锋</fullName>
+ <default>false</default>
+ <label>璐存伅璐锋</label>
+ </value>
+ <value>
<fullName>銇濄伄浠�</fullName>
<default>false</default>
<label>銇濄伄浠�</label>
--
Gitblit v1.9.1