代码冲突

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

@@ -177,13 +177,6 @@ public class OrderChildServiceImpl implements OrderChildService {
     private OrderChildLoanComponent orderChildLoanComponent;
 
 
-    @Autowired
-    private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
-
-    @Autowired
-    private OrderChildLoanComponent orderChildLoanComponent;
-
-
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {