Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-26 36e3950ade8195a7d2fcea64c5118e3ddeec8c44

 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);