Merge branch 'develop'

jiangyouyao

2022-04-06 556aca9f39838c5a7e72ac86ac64f42f923c5a2a

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopProductDao.java

@@ -53,6 +53,8 @@
    */
   List<ShopProduct> selectByIds(@Param("ids") List<Integer> ids);

   List<String> selectProductNameByIds(@Param("ids") List<Integer> ids);

   List<ShopProduct> selectProductByAttrid(@Param("attrId") String attrId,@Param("shopId") Long shopId);