Authored by 郝肖肖

Merge branch 'feature/brandCoupon' into release/5.2

require('./shop/shop');
require('./shop/coupon');
require('./shop/shop');
... ...
... ... @@ -33,6 +33,7 @@ shopCoupon = {
$.ajax({
method: 'GET',
url: _url,
async: false,
data: {
shopId: that.common.shopId,
brandId: that.common.brandId,
... ...