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

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

@@ -367,6 +367,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
         settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
         settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
+        settlementOwner.setLoanFreight(settlementOwnerDetail.getLoanFreight());
         settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
 
         List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
@@ -452,6 +453,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setWeight(settlementOwnerDetail.getWeight());
         settlementOwner.setFreight(settlementOwnerDetail.getFreight());
         settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight());
+        settlementOwner.setLoanFreight(settlementOwnerDetail.getLoanFreight());
         settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
         settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
         settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());