fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

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