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/Statu_Achievements__c/fields/ShippedAmount_ZM_WithoutTax_152P__c.field-meta.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/Statu_Achievements__c/fields/ShippedAmount_ZM_WithoutTax_152P__c.field-meta.xml b/force-app/main/default/objects/Statu_Achievements__c/fields/ShippedAmount_ZM_WithoutTax_152P__c.field-meta.xml
index 69836f1..b4e89a2 100644
--- a/force-app/main/default/objects/Statu_Achievements__c/fields/ShippedAmount_ZM_WithoutTax_152P__c.field-meta.xml
+++ b/force-app/main/default/objects/Statu_Achievements__c/fields/ShippedAmount_ZM_WithoutTax_152P__c.field-meta.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>ShippedAmount_ZM_WithoutTax_152P__c</fullName>
-    <description>20210426 鏉庢椇淇敼  瀛楁鍚嶇О</description>
+    <description>20210426 鏉庢椇淇敼  瀛楁鍚嶇О
+20220408 璐㈠勾鍒囨崲  瀛楁鍚嶇О</description>
     <externalId>false</externalId>
     <formula>Case( Opportunity__r.Trade__c, 
 &quot;鍐呰部&quot;,ShippedAmount_ZM_153P__c/ Opportunity__r.Tax_Intra_F_Copy__c , 
 &quot;澶栬部&quot;,ShippedAmount_ZM_153P__c* Opportunity__r.Tax_Foreign_F_Copy__c, 
 ShippedAmount_ZM_153P__c)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
-    <label>鍙戣揣閲戦_鍏冿紙涓嶅惈绋庯級锛圸M锛夛紙FY2022锛�</label>
+    <label>鍙戣揣閲戦_鍏冿紙涓嶅惈绋庯級锛圸M锛夛紙FY2023锛�</label>
     <precision>18</precision>
     <required>false</required>
     <scale>2</scale>

--
Gitblit v1.9.1