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/Maintenance_Contract__c/fields/Due_Inspection_sum__c.field-meta.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Maintenance_Contract__c/fields/Due_Inspection_sum__c.field-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/fields/Due_Inspection_sum__c.field-meta.xml
index ce9f213..f438802 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/fields/Due_Inspection_sum__c.field-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/fields/Due_Inspection_sum__c.field-meta.xml
@@ -4,6 +4,11 @@
<externalId>false</externalId>
<label>鐐规璁″垝鍒版湡娆℃暟锛堝疄鏃讹級</label>
<summarizedField>Inspectup_Plan__c.TOOREND_txt__c</summarizedField>
+ <summaryFilterItems>
+ <field>Inspectup_Plan__c.History_datanew_txt__c</field>
+ <operation>equals</operation>
+ <value>False</value>
+ </summaryFilterItems>
<summaryForeignKey>Inspectup_Plan__c.Maintenance_Contract__c</summaryForeignKey>
<summaryOperation>sum</summaryOperation>
<trackHistory>false</trackHistory>
--
Gitblit v1.9.1