Merge branch 'developer' into alpha

Helius

2022-03-15 5b94c18b2204a96be55798f1619a416526288e76

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java

@@ -1,6 +1,6 @@
package com.matrix.system.shopXcx.api.action;

import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.common.init.UserCacheManager;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.common.interceptor.HostInterceptor;
@@ -25,7 +25,7 @@
    @Autowired
    private ShopCouponDao shopCouponDao;
    @Autowired
    private RedisUserLoginUtils redisUserLoginUtils;
    private UserCacheManager userCacheManager;

    /**
     * 获取可以领取的优惠券