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

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

@@ -45,6 +45,8 @@ public class CarrierPageSettlementOwnerVO {
     @MoneyOutConvert
     @ApiModelProperty(value = "结算金额")
     private BigDecimal settlementFreight;
+    @ApiModelProperty(value = "借款金额")
+    private BigDecimal loanFreight;
     @MoneyOutConvert
     @ApiModelProperty(value = "开票金额")
     private BigDecimal invoiceFreight;

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerDetailVO.java

@@ -65,6 +65,10 @@ public class CarrierSettlementOwnerDetailVO {
     @MoneyOutConvert
     private BigDecimal settlementFreight;
 
+    @ApiModelProperty(value = "借款金额（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal loanFreight;
+
     @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "1")
     private Integer invoiceTypeCode;
 

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -69,6 +69,10 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="结算金额",example = "1.2")
     private BigDecimal settlementFreight;
 
+    @MoneyOutConvert
+    @ApiModelProperty(value="借款抵扣金额",example = "1.2")
+    private BigDecimal loanFreight;
+
     @MoneyOutConvert
     @ApiModelProperty(value="开票金额",example = "2.1")
     private BigDecimal invoiceFreight;

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

@@ -40,8 +40,6 @@ public class CarrierSettlementOwnerController {
         return Result.ok(settlementOwnerService.getCarrierSettlementOwnerDetail(id));
     }
 
-
-
     @ApiOperation(value = "承运端-结算单列表（货主）",notes = "<br>By:刘海泉")
     @PostMapping("/pageCarrierSettlementOwner")
     @UnitCovert(param = false)