Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java

@@ -30,6 +30,11 @@
            public R<CouponMember> getCouponMember(CouponMemberDTO couponMemberDTO, String source) {
                return R.fail("获取会员优惠券信息失败:" + cause.getMessage());
            }

            @Override
            public R<?> updCouponMember(CouponMemberDTO couponMemberDTO, String source) {
                return R.fail("修改会员优惠券信息失败:" + cause.getMessage());
            }
        };