修改代码冲突

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

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

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -81,7 +81,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getCancelOrderGoods")
-    List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<OrderGoodsTruckBind> param);
+    List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<String> param);
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getAlreadyTransportWeight")
     BigDecimal getAlreadyTransportWeight(@Param("orderNo") String orderNo);
 }