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/Bulletin_Board__c/fields/Buzhang_Zongjian__c.field-meta.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/Bulletin_Board__c/fields/Buzhang_Zongjian__c.field-meta.xml b/force-app/main/default/objects/Bulletin_Board__c/fields/Buzhang_Zongjian__c.field-meta.xml
index 51f692d..93100b1 100644
--- a/force-app/main/default/objects/Bulletin_Board__c/fields/Buzhang_Zongjian__c.field-meta.xml
+++ b/force-app/main/default/objects/Bulletin_Board__c/fields/Buzhang_Zongjian__c.field-meta.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Buzhang_Zongjian__c</fullName>
+ <description>SWAG-C478M2</description>
<externalId>false</externalId>
<formula>BP_Buzhang__c == BP_ZongJian__c</formula>
<formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
- <label>CL5 鎬荤洃绾�=CL4 楂樼骇鎬荤洃</label>
+ <label>CL5 鎬荤洃绾�= CL4 楂樼骇鎬荤洃</label>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
--
Gitblit v1.9.1