From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject

---
 force-app/main/default/objects/Consumable_Orderdetails__c/fields/Product_Pattern__c.field-meta.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Product_Pattern__c.field-meta.xml b/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Product_Pattern__c.field-meta.xml
index 5ac84bd..941d72b 100644
--- a/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Product_Pattern__c.field-meta.xml
+++ b/force-app/main/default/objects/Consumable_Orderdetails__c/fields/Product_Pattern__c.field-meta.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Product_Pattern__c</fullName>
+    <description>SWAG-CH65B7锛欳onsumable_product__c  &amp; IF(isOutPattern__c,&apos;鏄�&apos;,&apos;鍚�&apos;)</description>
     <externalId>false</externalId>
-    <formula>Consumable_product__c  &amp; IF(isOutPattern__c,&apos;鏄�&apos;,&apos;鍚�&apos;)</formula>
+    <formula>Consumable_product__r.Asset_Model_No__c &amp; IF(isOutPattern__c,&apos;鏄�&apos;,&apos;鍚�&apos;)</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>鐗逛环浜у搧</label>
     <required>false</required>

--
Gitblit v1.9.1