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/Need_Buzhang_Sale_NewApp__c.field-meta.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml b/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
index 843b542..899ef80 100644
--- a/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/fields/Need_Buzhang_Sale_NewApp__c.field-meta.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Need_Buzhang_Sale_NewApp__c</fullName>
- <description>OPD璁″垝鏃朵笂绾匡紝鐢ㄤ綔鎺ㄥ箍缁忕悊鍜岀粡鐞嗕竴鑷达紝鍙互鐩存帴涓�姝ュ鎵归�氳繃鐢�</description>
+ <description>OPD璁″垝鏃朵笂绾匡紝鐢ㄤ綔鎺ㄥ箍缁忕悊鍜岀粡鐞嗕竴鑷达紝鍙互鐩存帴涓�姝ュ鎵归�氳繃鐢�
+20220422 ljh 鍘绘帀 鍖荤枟鍗庡寳钀ヤ笟鏈儴 SFDC-CDPAYF</description>
<externalId>false</externalId>
<formula>!((NOT( ISBLANK( SalesManager__c ))
&& (SalesManager_eq_Buchang__c = false
|| NOT((ISPICKVAL(Owner:User.Dept__c, '鑳介噺浜嬩笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡寳钀ヤ笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟澶囧搧绠＄悊涓績')
@@ -19,7 +19,6 @@
NOT( ISBLANK( BuchangApprovalManagerSales__c ) )
&& (ISPICKVAL(Owner:User.Dept__c, '鑳介噺浜嬩笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟涓滃寳钀ヤ笟鏈儴')
-|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡寳钀ヤ笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庝笢钀ヤ笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟鍗庡崡钀ヤ笟鏈儴')
|| ISPICKVAL(Owner:User.Dept__c, '鍖荤枟澶囧搧绠＄悊涓績')
--
Gitblit v1.9.1