Merge branch 'v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -34,7 +34,7 @@ public enum PerformanceResultEnum implements ResultEnum {
 
 
     ORDER_GOODS_NO_FOUND(1200, "货单不存在"),
-    ORDER_WEIGHT_LACK(1201, "剩余吨数不足,请联系客服或发起取消"),
+    ORDER_WEIGHT_LACK(1201, "剩余吨数不足，请联系客服"),
     ORDER_INVALID(1202, "无效的货单"),
     ORDER_INVALID1(1203, "当前运单的货源已完成或取消，请查看其他货源"),
 

performance-api/src/main/java/com/clx/performance/feign/OrderChildFeign.java

 package com.clx.performance.feign;
 
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
+import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,7 +17,7 @@ public interface OrderChildFeign {
      * 线路运单统计
      */
     @RequestMapping(value = "clx-performance/feign/orderChild/lineStatistics", method = RequestMethod.GET)
-    OrderChildLineStatisticsVO lineStatistics(@RequestParam @NotNull(message = "发货地址不可为空") Integer sendSystemAddressId,
+    Result<OrderChildLineStatisticsVO> lineStatistics(@RequestParam @NotNull(message = "发货地址不可为空") Integer sendSystemAddressId,
                                               @RequestParam @NotNull(message = "收货货地不可为空") Integer receiveSystemAddressId);
 
 }