Merge branch 'developer' into alpha

Helius

2022-03-09 2c481ac06298b5c464fd927893ce4c62b03c39c0

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

@@ -58,4 +58,5 @@
   public List<ShopCoupon> selectHdListByProductId(@Param("productId") Integer productId, @Param("attrIds") List<String> attrIds, @Param("companyId")Long companyId);

    ShopCoupon getCouponByTitle(@Param("title")String title, @Param("companyId")Long companyId);

}