From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/LexConInvoicedetailsController.cls | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/LexConInvoicedetailsController.cls b/force-app/main/default/classes/LexConInvoicedetailsController.cls
index 039e19e..4f220f5 100644
--- a/force-app/main/default/classes/LexConInvoicedetailsController.cls
+++ b/force-app/main/default/classes/LexConInvoicedetailsController.cls
@@ -34,11 +34,15 @@
sumPrice = 0;
coc = new Consumable_order__c();
//鍑哄簱鍗曚俊鎭�
+<<<<<<< HEAD
coc = [
SELECT Id, Name, Outbound_Date__c, Order_ForDealerText__c, Dealer_Info__c
FROM Consumable_order__c
WHERE Id = :orderId
];
+=======
+ coc = [SELECT Id, Name, Outbound_Date__c, Order_ForDealerText__c, Dealer_Info__c FROM Consumable_order__c WHERE Id = :orderId];
+>>>>>>> LEXCommunityLiJun
//鍙戠エ淇℃伅
invoicecode = [
SELECT Id, Name, ShipmentAccount__c, Order_ForCustomerText__c, Order_ForDealerText__c, Dealer_Info__c
@@ -399,4 +403,8 @@
Invoice_UnitOptsMap.put('涓�', '涓�');
}
}
+<<<<<<< HEAD
}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1