修改merge

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

@@ -42,7 +42,6 @@ public class TempController {
     private TransportFeignService transportFeignService;
     @Autowired
     OrderChildDtsListener orderChildDtsListener;
-    private OrderChildDtsListener orderChildDtsListener;
 
     @Autowired
     private OrderChildService orderChildService;