解决冲突

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -197,4 +197,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
 
     void updateBatchOwnerCancel(List<String> childNos);
+
+    List<OrderChild> listByChildNoList(List<String> childNoList);
 }