Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

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

@@ -89,4 +89,6 @@
   List<ShoppingGoodsListVo> selectShoppingGoodsApiInPage(@Param("record") ShoppingGoodsListDto shoppingGoodsListDto, @Param("pageVo") PaginationVO pageVo);

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

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