Merge branch 'ty_fix' into alpha

Helius

2021-11-11 404c2fea96204bc0fc4a6845cb13d1992d728aa4

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