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/action/WxShopCouponAction.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java
index e0211b2..b57dc41 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java
@@ -58,11 +58,11 @@
      *
      * @return
      */
-    @RequestMapping(value = "getMyCouponInfoByStatus/{shopId}/{status}")
+    @RequestMapping(value = "getMyCouponInfoByStatus/{status}")
     @ResponseBody
-    public AjaxResult getMyCouponInfo(@PathVariable("shopId") Long shopId,@PathVariable("status") Integer status, @RequestBody PaginationVO pageVo) {
+    public AjaxResult getMyCouponInfo(@PathVariable("status") Integer status, @RequestBody PaginationVO pageVo) {
 
-        return shopCouponService.getMyCouponInfoByStatus(shopId,status, pageVo);
+        return shopCouponService.getMyCouponInfoByStatus(HostInterceptor.getCompanyId(),status, pageVo);
     }
 
     /**

--
Gitblit v1.9.1