Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -90,6 +90,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 //        // 结算金额
 //        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
 //
+        //借款抵扣金额初始化
+        settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         //设置开票公司信息