Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-07-20 b8d9a7cd20dfbaa3c0cc08f3c27e4addd8774e95

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopCouponServiceImpl.java

@@ -157,7 +157,7 @@
    }

    /**
     * 领取优惠券
     *
     *
     * @param couponId
     * @return