From 1b3fb93f787b8b546a307bf063183f5295d183f8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:53:25 +0800
Subject: [PATCH] merge

---
 force-app/main/default/objects/Rental_Apply__c/fields/faraway__c.field-meta.xml |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/faraway__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/faraway__c.field-meta.xml
index b55d12b..ba7b2da 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/faraway__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/faraway__c.field-meta.xml
@@ -12,10 +12,7 @@
 &apos;浜戝崡鐪�&apos;,IF(HP_City__c = &apos;鏄嗘槑甯�&apos;, &apos;0&apos;, &apos;1&apos;),
 &apos;0&apos;
 )
-杩藉姞鐢樿們鐪�
-update lxy 2021/8/13 杩藉姞
-鍥涘窛鐪�	闃垮潩钘忔棌缇屾棌鑷不宸炪�佺敇瀛滆棌鏃忚嚜娌诲窞銆佸噳灞卞綕鏃忚嚜娌诲窞
-瑗胯棌	鍏ㄥ煙</description>
+杩藉姞鐢樿們鐪�</description>
     <externalId>false</externalId>
     <formula>Case(Province__c,
 &apos;鍐呰挋鍙よ嚜娌诲尯&apos;,&apos;1&apos;,
@@ -26,8 +23,6 @@
 &apos;鍚夋灄鐪�&apos;,&apos;1&apos;,
 &apos;鐢樿們鐪�&apos;,&apos;1&apos;,
 &apos;浜戝崡鐪�&apos;,IF(HP_City__c = &apos;鏄嗘槑甯�&apos;, &apos;0&apos;, &apos;1&apos;),
-&apos;瑗胯棌鑷不鍖�&apos;,&apos;1&apos;,
-&apos;鍥涘窛鐪�&apos;,IF(HP_City__c = &apos;闃垮潩宸�&apos;  || HP_City__c = &apos;鐢樺瓬宸�&apos; ||  HP_City__c = &apos;鍑夊北宸�&apos;, &apos;1&apos;, &apos;0&apos;),
 &apos;0&apos;
 )</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>

--
Gitblit v1.9.1