Merge branch 'ty_fix' into alpha

Helius

2021-11-08 853432d64a60950261f5cfb6b06328345b29467d

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