fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsDao.java

@@ -91,4 +91,6 @@
   int selectShopppingGoodsAipTotal(@Param("record") ShoppingGoodsListDto shoppingGoodsListDto);

   public List<ShoppingGoods> selectByIds(@Param("ids")List<Integer> ids);

   int updateInvalidProduct();
}