Merge branch 'developer'

姜友瑶

2022-05-23 eaefb5f0d4fb5918786936dd60f4be7dd93011ba

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

@@ -90,7 +90,7 @@

   int selectShopppingGoodsAipTotal(@Param("record") ShoppingGoodsListDto shoppingGoodsListDto);

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

   int updateInvalidProduct();
}