代码冲突解决

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -279,8 +279,6 @@ public class OrderChildServiceImpl implements OrderChildService {
     private ClxMessageOpenapiFeign clxMessageOpenapiFeign;
     @Autowired
     private ClxMessageConfig messageConfig;
-    @Autowired
-    private OrderWeightService orderWeightService;
 
     @Autowired
     private LoadAppConfig loadAppConfig;