From 446868d70ffeecaeeffb3bed900c0be97ecadbab Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 20 Apr 2022 08:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponDao.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponDao.java
index b5bb5d8..f92e198 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponDao.java
+++ b/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);
+
}
\ No newline at end of file
--
Gitblit v1.9.1