From 708fd530fe4c1565ca2f20707a911b03e59c925f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 09 Mar 2021 09:32:44 +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 e6cde48..93bea5c 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
@@ -42,12 +42,12 @@
 	 * 根据状态获取我的优惠券
 	 * 
 	 *
-	 * @param shopId
+	 * @param companyId
 	 * @param status
 	 * @param pageVo
 	 * @return
 	 */
-	AjaxResult getMyCouponInfoByStatus(Long shopId, Integer status, PaginationVO pageVo);
+	AjaxResult getMyCouponInfoByStatus(Long companyId, Integer status, PaginationVO pageVo);
 
 	/**
 	 * 根据产品ID获取优惠券列表

--
Gitblit v1.9.1