From 1cd8df7e8f42fb0d9292055ff97e4e5480087112 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 08 Mar 2021 16:44:16 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponDao.java |    2 +-
 1 files changed, 1 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 084115a..b5bb5d8 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
@@ -45,7 +45,7 @@
 										@Param("productId") Integer productId, @Param("attrIds") List<String> attrIds);
 
 	List<ShopCoupon> selectCouponListByTag(@Param("isNewPeople") boolean isNewPeople, @Param("userId") String userId,
-										   @Param("tag") String tag,@Param("shopId") Long shopId);
+										   @Param("tag") String tag,@Param("companyId") Long companyId);
 
 	public int updateStateByStateAndIds(@Param("list") List<String> list, @Param("state") int state);
 

--
Gitblit v1.9.1