Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

 package com.clx.performance.controller.temp;
 
+import com.clx.performance.config.MslPaymentConfig;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
@@ -30,14 +31,16 @@ public class TempController {
     private TempService tempService;
     @Autowired
     private FeignOrderChildService carrierOrderChildService;
+    @Autowired
+    private MslPaymentConfig mslPaymentConfig;
 
 
 
     @ApiOperation(value = "test", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/test", method = RequestMethod.GET)
-    public Result<OrderChildLineStatisticsVO> test(Integer sendAddressId, Integer receiveAddressId) {
+    public Result<MslPaymentConfig> test() {
 
-        return Result.ok(carrierOrderChildService.getLineStatistics(sendAddressId, receiveAddressId));
+        return Result.ok(mslPaymentConfig);
     }
 
     @ApiOperation(value = "更新网运标识", notes = "<br>By:艾庆国")