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/ProvinceCodeOfEquipment__c.field-meta.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/fields/ProvinceCodeOfEquipment__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/ProvinceCodeOfEquipment__c.field-meta.xml
index d951637..a244ceb 100644
--- a/force-app/main/default/objects/Repair__c/fields/ProvinceCodeOfEquipment__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/ProvinceCodeOfEquipment__c.field-meta.xml
@@ -44,8 +44,8 @@
 &apos;涓婃捣RC&apos;, &apos;020&apos;,
 &apos;骞垮窞RC&apos;, &apos;190&apos;,
 &apos;娌堥槼RC&apos;, &apos;340&apos;,
-&apos;鏉窞RC&apos;,&apos;420&apos;,
-&apos;瑗垮畨RC&apos;,&apos;400&apos;,
+&apos;鏉窞RC&apos;, &apos;420&apos;,
+&apos;瑗垮畨RC&apos;, &apos;400&apos;,
 &apos;鎴愰兘RC&apos;,&apos;410&apos;,
 &apos;&apos;)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>

--
Gitblit v1.9.1