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/api/service/WxShopCouponService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java
index b406cb6..e6cde48 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java
@@ -62,10 +62,10 @@
 	 * 根据标签获取优惠券列表
 	 *
 	 * @param tag
-	 * @param shopId
+	 * @param companyId
      * @return
 	 */
-	AjaxResult getCouponListByTag(String tag, Long shopId);
+	AjaxResult getCouponListByTag(String tag, Long companyId);
 
 	/**
 	 * 根据产品id查询该产品符合的优惠活动

--
Gitblit v1.9.1