Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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

@@ -55,7 +55,8 @@

   ShopCoupon selectByIdAndUserId(@Param("id") Integer id, @Param("userId") String userId);

   public List<ShopCoupon> selectHdListByProductId(@Param("productId") Integer productId, @Param("attrIds") List<String> attrIds);
   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);

}