fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 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