Merge branch 'master' into LightningUpgradeProject

buli

2023-06-05 e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f

 force-app/main/default/classes/NFM104Rest.cls

@@ -313,6 +313,10 @@
                            else if (di.DiscountType == '运输索赔') {
                                rq.Delivery_compensation__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
                            }
                            //DB202303075842 LY 2023/3/6 add
                            else if (di.DiscountType == '上限合同'){
                                rq.LimitPrice_contract_discount_amount__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);
                            }
                            //
                            else if (di.DiscountType == '其他') {
                                rq.Other_discount__c = String.isBlank(di.DiscountAmount) ? null : Decimal.valueOf(di.DiscountAmount);