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/Agency_Opportunity__c/listViews/OPP_Real.listView-meta.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Agency_Opportunity__c/listViews/OPP_Real.listView-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/listViews/OPP_Real.listView-meta.xml
index 86b74fb..96f4177 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/listViews/OPP_Real.listView-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/listViews/OPP_Real.listView-meta.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ListView xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>OPP_Real</fullName>
+ <columns>Agency_Opportunity_No__c</columns>
+ <columns>Is_Transformed__c</columns>
<columns>OCM_Change_To_Opportunity_Flg__c</columns>
<columns>NAME</columns>
<columns>Agency__c</columns>
--
Gitblit v1.9.1