Merge branch 'v17.5_order_child_sync_broker_20240617' into test

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

@@ -77,7 +77,7 @@ public class CarrierPageSettlementDriverDetailVO {
     @ApiModelProperty(value = "开票公司id")
     private Integer invoicingCompanyId;
     @ApiModelProperty(value = "开票公司简称")
-    private Integer invoicingCompanyShorterName;
+    private String invoicingCompanyShorterName;
     @MoneyOutConvert
     @ApiModelProperty(value = "平台服务费")
     private BigDecimal platformServiceFee;