解决冲突

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

@@ -86,8 +86,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId);
     void updateReceiveSystemAddress(Integer ownerAddressId, Integer systemAddressId);
 
-    List<OrderGoods> getOrderGoodsListByOrderNoAndStatus(String orderNo);
-
     List<OrderGoodsAPPVO> getCancelOrderGoods(List<String> list);
 
     BigDecimal getAlreadyTransportWeight(String orderNo);