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

zxl

2 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

 framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java

@@ -161,7 +161,7 @@
     * @return 会员优惠券列表
     */
    @Override
    @Cacheable(key = "#memberId")
//    @Cacheable(key = "#memberId")
    public List<MemberCoupon> getMemberCoupons(String memberId) {
        MemberCouponSearchParams searchParams = new MemberCouponSearchParams();
        searchParams.setMemberId(Objects.requireNonNull(UserContext.getCurrentUser()).getId());