From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/LexConsumableOrderManageController.cls | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableOrderManageController.cls b/force-app/main/default/classes/LexConsumableOrderManageController.cls
index 1b280f4..81e1a82 100644
--- a/force-app/main/default/classes/LexConsumableOrderManageController.cls
+++ b/force-app/main/default/classes/LexConsumableOrderManageController.cls
@@ -56,13 +56,8 @@
List<CusCol> cols = new List<CusCol>();
for (FieldSetMember fsm : fsmList) {
//add by Link
-<<<<<<< HEAD
if (fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET') {
} else {
-=======
- if(fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET'){
- }else {
->>>>>>> LEXCommunityLiJun
CusCol col = new CusCol();
col.label = fsm.getLabel();
col.fieldName = fsm.getFieldPath();
@@ -130,15 +125,7 @@
raesList = Database.query(soql);
//add by rentx 2021-3-10 start
//涓� hasHop 璧嬪�� 鍒ゆ柇褰撳墠缁忛攢鍟嗕笅鏄惁鏈夌壒浠峰尰闄�
-<<<<<<< HEAD
- List<hospitalprice__c> hopList = [
- SELECT id, hospital__c
- FROM hospitalprice__c
- WHERE account__c = :accountid
- ];
-=======
List<hospitalprice__c> hopList = [SELECT id, hospital__c FROM hospitalprice__c WHERE account__c = :accountid];
->>>>>>> LEXCommunityLiJun
if (hopList == null || hopList.size() == 0) {
hasHop = false;
} else {
@@ -156,15 +143,7 @@
for (Account acc : contractList) {
dealIds.add(acc.Id);
}
-<<<<<<< HEAD
- List<Dealer_Product__c> deList = [
- SELECT id
- FROM Dealer_Product__c
- WHERE Dealer_Contact__c IN :dealIds
- ];
-=======
List<Dealer_Product__c> deList = [SELECT id FROM Dealer_Product__c WHERE Dealer_Contact__c IN :dealIds];
->>>>>>> LEXCommunityLiJun
if (deList == null || deList.size() == 0) {
hasSpecial = false;
} else {
@@ -353,8 +332,4 @@
@AuraEnabled
public String fieldName;
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1